Merge "Fix AttributeError when test_function_help fails"