Moved test specific code to ./test