Moved the tests into a test specific folder