I wonder if it's worth making a `generateTestTenantHost` in this PR as well ? Also, might be worth moving them to TenantsTestUtil as TestsUtil I'm afraid is getting bloated really quick with this pattern.