OP-1379 - add unit testing
OP-1379 - fix queuing