Merge "Fix typos in unit tests" into nextgenv2