Cleanup
Move tests to test dir