Add tenancy tests