ClientChannel unit tests fixes