Changed file structure for test classes