PHOENIX-108 More testing around multi-tenancy