Improve tests and coverage for datachannel changes