Use the chan only if given, fix tests that don't use chans