Fixed up the tests for the current API of the 3.0 driver.