Fix tests since the change for models with single object