Update all tests to new Query Driver interface