Make tests working, add old CombiningStreamTest.cs