Streambuffer tests
Some changes