Correct channel type for topic named stream source.
Some test fixes.