Moved the tests over to the correct folder