Merge branch 'develop' into develop-evmcc

Conflicts:
	CMakeLists.txt
	alethzero/CMakeLists.txt
	eth/CMakeLists.txt
	exp/CMakeLists.txt
	libethereum/CMakeLists.txt
	neth/CMakeLists.txt
	test/CMakeLists.txt
	test/TestHelper.cpp
	windows/Eth.vcxproj
	windows/Ethereum.sln
	windows/LibEthereum.vcxproj
	windows/LibEthereum.vcxproj.filters
	windows/TestEthereum.vcxproj
	windows/TestEthereum.vcxproj.filters
	windows/bootstrap.sh

1 files changed, 20 insertions, 0 deletions

diff --git a/state.cpp b/state.cpp
index 11ecf48c..b1ad8d44 100644
--- a/state.cpp
+++ b/state.cpp
@@ -132,11 +132,31 @@ BOOST_AUTO_TEST_CASE(stLogTests)
 	dev::test::executeTests("stLogTests", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stRecursiveCreate)
+{
+	dev::test::executeTests("stRecursiveCreate", "/StateTests", dev::test::doStateTests);
+}
+
+BOOST_AUTO_TEST_CASE(stInitCodeTest)
+{
+	dev::test::executeTests("stInitCodeTest", "/StateTests", dev::test::doStateTests);
+}
+
+BOOST_AUTO_TEST_CASE(stTransactionTest)
+{
+	dev::test::executeTests("stTransactionTest", "/StateTests", dev::test::doStateTests);
+}
+
 BOOST_AUTO_TEST_CASE(stSpecialTest)
 {
 	dev::test::executeTests("stSpecialTest", "/StateTests", dev::test::doStateTests);
 }
 
+BOOST_AUTO_TEST_CASE(stRefundTest)
+{
+	dev::test::executeTests("stRefundTest", "/StateTests", dev::test::doStateTests);
+}
+
 BOOST_AUTO_TEST_CASE(stCreateTest)
 {
 	for (int i = 1; i < boost::unit_test::framework::master_test_suite().argc; ++i)