Merge "Fix typos in scenario tests, etc."