updated tests and removed new ordereddict dependency.  Needs to
be address in driver finalization