Enqueued channel ops re-enter state machine properly, fix broken test