Merge "Fix standalone tests for cygwin"