Merge "Fix typo, tests on Mac"