Refactored Driver instance name.
Refactored test.
More test refactoring.