Following new protocol

* PutOnQueue now follows protocol
* Test fixes