Add channelservice tests. Adjust channelservice.