Added more test coverage for driver.