Starting to fix the stream tests.
Making sure we math round it.
Fixing stream tests, so it's a lot more robust.