Some test classes renamed