Small changes testing across OSs