Merge pull request #294 from mikedewar/master

trivial testing bug fixes
Merge pull request #295 from mikedewar/master

another little fix to the testing suite. All this will be superfluous.
Merge branch 'master' of github.com:nytlabs/streamtools