Moved ChannelAdapter out of tests