moved test classes around