fixup! review fixes + fix test run on non-linux OSs