Moved the tests to a subfolder