Clean up event-stream from tests where it's possible