BUG Fixed cross-platform issues with test cases and file utilities
Merge pull request #2478 from tractorcow/pulls/3.1-platform-compatibility

BUG 3.1 Fixed cross-platform issues with test cases and file utilities