Attempting to fix unit tests for unix systems