Merge "Use base.setup_test_tenant to create test tenant"