Removing unused EventDrivers 
more updates to EventDriver unittests