Merge "Fix some typos in log and test"