Renamed DispatcherFlushMap to more apt name DispatcherFlushRules and fixed failing tests