Merge "Fix command line GUI test script on the Mac"