Fix tenancy tests