Adjust how macOS drives are analysed and add a couple of tests.