Replaced channels to buffered ones. Improved test on simple cat slightly.