Merge "Fix tenant leaking in test_tenants.py"