fixed issues with the tests caused by new channel code