Switch to expect syntax for unit tests.
Clear up a few of the channel tests.