Rename WorkUnitsDispatcher to just Dispatcher
Fixup tests to pass with new Dispatcher