Assertions should be removed immediately after matching unless persisted...

Assertions should be removed immediately after matching unless persisted, not after the delay period executes.

Additional fix for an issue that caused a timeout to occur before replying regardless of whether there was a delay or not, which would cause issues with non-persistent assertions.