Refactoring Tests into DriverTestCase