changing some test classes to the test directory