Changes to allow the UserAndOrganizationTest to work