Channel.id changed to Channel.ref, test added
Merge remote-tracking branch 'origin/master'