Rename some test classes