Fixing driver sort of not really.  Also added in new test stuff