diff --git a/ethcore/src/client/evm_test_client.rs b/ethcore/src/client/evm_test_client.rs
index 74f2b2fc1..20a04613a 100644
--- a/ethcore/src/client/evm_test_client.rs
+++ b/ethcore/src/client/evm_test_client.rs
@@ -182,6 +182,19 @@ impl<'a> EvmTestClient<'a> {
 			gas_used: 0.into(),
 			gas_limit: *genesis.gas_limit(),
 		};
+		self.call_envinfo(params, tracer, vm_tracer, info)
+	}
+
+	/// Execute the VM given envinfo, ActionParams and tracer.
+	/// Returns amount of gas left and the output.
+	pub fn call_envinfo<T: trace::Tracer, V: trace::VMTracer>(
+		&mut self,
+		params: ActionParams,
+		tracer: &mut T,
+		vm_tracer: &mut V,
+		info: client::EnvInfo,
+	) -> Result<FinalizationResult, EvmTestError>
+	{
 		let mut substate = state::Substate::new();
 		let machine = self.spec.engine.machine();
 		let schedule = machine.schedule(info.number);
diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs
index 7a746b74b..fefa9b5e0 100644
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -159,6 +159,7 @@ pub mod header;
 pub mod machine;
 pub mod miner;
 pub mod pod_state;
+pub mod pod_account;
 pub mod snapshot;
 pub mod spec;
 pub mod state;
@@ -167,7 +168,6 @@ pub mod trace;
 pub mod verification;
 
 mod cache_manager;
-mod pod_account;
 mod account_db;
 mod externalities;
 mod blockchain;
diff --git a/ethcore/src/pod_account.rs b/ethcore/src/pod_account.rs
index f35f05177..3b66705ba 100644
--- a/ethcore/src/pod_account.rs
+++ b/ethcore/src/pod_account.rs
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+//! Account system expressed in Plain Old Data.
+
 use std::fmt;
 use std::collections::BTreeMap;
 use itertools::Itertools;