Small stream engine issue and test_monitor tidy up

Resolve an intermittent (race) test failure.