Fix tests for non-macs