Fix Channel tests