remove kiwi + add test for ChannelService