Update driver and test class in support of refactor