Hopefully fixed the defects in the streamshipper. Tests run, but tests
of other components still fail