Merge "Separate negative tests for test_simple_tenant_usage"