Merge "expected_success should be a classmethod"