DriverFactory are now classes to allow inheritance
Fix a bug where Delay & DelayFor will be terminated by 30s deadline prematurely.