Merge "Fix fail logic for server of another tenant test"