diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
index 28f963d65..bd6199867 100644
--- a/ethcore/src/executive.rs
+++ b/ethcore/src/executive.rs
@@ -415,7 +415,7 @@ mod tests {
 		state.add_balance(&sender, &U256::from(0x100u64));
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		let gas_left = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
@@ -474,7 +474,7 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100));
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		let gas_left = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
@@ -528,7 +528,7 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100));
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		let gas_left = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
@@ -580,7 +580,7 @@ mod tests {
 		state.add_balance(&sender, &U256::from(100));
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(1024, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		{
 			let mut ex = Executive::new(&mut state, &info, &engine);
@@ -641,7 +641,7 @@ mod tests {
 
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		let gas_left = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
@@ -686,7 +686,7 @@ mod tests {
 		state.init_code(&address, code.clone());
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		let gas_left = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
@@ -723,7 +723,7 @@ mod tests {
 
 		let executed = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.transact(&t).unwrap()
+			ex.transact(&t, false).unwrap()
 		};
 
 		assert_eq!(executed.gas, U256::from(100_000));
@@ -756,7 +756,7 @@ mod tests {
 
 		let res = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.transact(&t)
+			ex.transact(&t, false)
 		};
 
 		match res {
@@ -787,7 +787,7 @@ mod tests {
 
 		let res = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.transact(&t)
+			ex.transact(&t, false)
 		};
 
 		match res {
@@ -820,7 +820,7 @@ mod tests {
 
 		let res = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.transact(&t)
+			ex.transact(&t, false)
 		};
 
 		match res {
@@ -853,7 +853,7 @@ mod tests {
 
 		let res = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
-			ex.transact(&t)
+			ex.transact(&t, false)
 		};
 
 		match res {
@@ -883,7 +883,7 @@ mod tests {
 		state.add_balance(&sender, &U256::from_str("152d02c7e14af6800000").unwrap());
 		let info = EnvInfo::default();
 		let engine = TestEngine::new(0, factory);
-		let mut substate = Substate::new();
+		let mut substate = Substate::new(false);
 
 		let result = {
 			let mut ex = Executive::new(&mut state, &info, &engine);
diff --git a/ethcore/src/externalities.rs b/ethcore/src/externalities.rs
index d37bc20fb..6f44bb51c 100644
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -312,7 +312,7 @@ mod tests {
 			TestSetup {
 				state: get_temp_state(),
 				engine: get_test_spec().to_engine().unwrap(),
-				sub_state: Substate::new(),
+				sub_state: Substate::new(false),
 				env_info: get_test_env_info()
 			}
 		}
diff --git a/ethcore/src/substate.rs b/ethcore/src/substate.rs
index 4a69cf492..b2056d1b9 100644
--- a/ethcore/src/substate.rs
+++ b/ethcore/src/substate.rs
@@ -96,13 +96,13 @@ mod tests {
 
 	#[test]
 	fn created() {
-		let sub_state = Substate::new();
+		let sub_state = Substate::new(false);
 		assert_eq!(sub_state.suicides.len(), 0);
 	}
 
 	#[test]
 	fn accrue() {
-		let mut sub_state = Substate::new();
+		let mut sub_state = Substate::new(false);
 		sub_state.contracts_created.push(address_from_u64(1u64));
 		sub_state.logs.push(LogEntry {
 			address: address_from_u64(1u64),
@@ -112,7 +112,7 @@ mod tests {
 		sub_state.sstore_clears_count = x!(5);
 		sub_state.suicides.insert(address_from_u64(10u64));
 
-		let mut sub_state_2 = Substate::new();
+		let mut sub_state_2 = Substate::new(false);
 		sub_state_2.contracts_created.push(address_from_u64(2u64));
 		sub_state_2.logs.push(LogEntry {
 			address: address_from_u64(1u64),