Support for canceling block not already dispatched
Clean up tests