improved test cases (now using concat-stream)