Fixes for multie-tenant test