Initial adjustments to avoid dangerous cyclic rules in DispatcherFlushRules
Cleanup and Tests