Merge "Correct test_get_usage_tenant's AttributeError"