2 files changed, 14 insertions, 12 deletions

diff --git a/main.cpp b/main.cpp
index 0cf46901..ed0ea76e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -42,11 +42,11 @@ int main(int, char**)
 	std::cout << asHex(s.out()) << std::endl;
 	std::cout << sha3(s.out()) << std::endl;*/
 
-//	hexPrefixTest();
-//	rlpTest();
-//	trieTest();
-//	daggerTest();
-//	cryptoTest();
+	hexPrefixTest();
+	rlpTest();
+	trieTest();
+	daggerTest();
+	cryptoTest();
 	vmTest();
 //	stateTest();
 //	peerTest(argc, argv);
diff --git a/vm.cpp b/vm.cpp
index 285a0397..9fe858e1 100644
--- a/vm.cpp
+++ b/vm.cpp
@@ -269,22 +269,24 @@ public:
 	Transactions txs;
 };
 
+#define CREATE_TESTS 0
+
 template <> class UnitTest<1>
 {
 public:
 	int operator()()
 	{
 		json_spirit::mValue v;
-		string s = asString(contents("/home/gav/Projects/cpp-ethereum/test/vmtests.json"));
-		cout << s << endl;
+#if CREATE_TESTS
+		string s = asString(contents("../../cpp-ethereum/test/vmtests.json"));
 		json_spirit::read_string(s, v);
-
-		doTests(v, true);
-
+		bool passed = doTests(v, true);
 		cout << json_spirit::write_string(v, true) << endl;
-
+#else
+		string s = asString(contents("../../tests/vmtests.json"));
+		json_spirit::read_string(s, v);
 		bool passed = doTests(v, false);
-
+#endif
 		return passed ? 0 : 1;
 	}