Cleanup of RoverDispatcher and added some test for it.