Moved the tests into a folder