Moved test classes to correct directory