Fix unit tests for other OS