Merge pull request #601 from weese/feature/stream-fixes

[FIX] fixed test_param_chooser
[FIX] fixed using issue