Fix Driver tests that I broke on Windows in r214924