Allow addChannel() calls to be chained
Refactored Tests accordingly