fixed tests and stream arguments