Renamed several test classes to avoid class name duplication