Fix small streamengine issue w/ term and handshake

Also tidy up monitor test a little.