Reworking a few imports to make them easier to patch as mock targets.
Lots of Channel unit tests