* op-supervisor: do not return zeroed included-in block

* op-supervisor: fix tests, implement review suggestion