devcommand-17 Make unit tests cross-platform and cleaner