Split ChannelTemplateContainer and update Test-Case