Progress! Only one of the tests in FailDriverTest fails for me now