Added tests for conditional unblocking