Fixed broken tests caused by pluralization of accommodation