Moved the tests to a subdirectory #34