Moved the tests into a separate directory