Reorganizing some test classes