Starting tests + fixes for stream terminators