Update tests to latest upstream changes (ChannelKeys rename, mostly)