Renamed BaseServiceTest to EntityServiceTest