Moved test classes to match filing convention