undo driver_test refactoring

moved to cleanup branch