restructuring test classes