Fix tests on all OS's