Merge "Fix AttributeError on BadRequest in scenario tests"