A couple of minor build fixes.
Merge pull request #21 from docfaraday/multistream_unit_tests

A couple of minor build fixes.