Moved the tests to separate files