WIP fix(channels): Updating channels

@ckarlof feedback?

WIP fixing tests...