First version without tests
Adapt tests to newer queue peaks output
Merge branch 'improved-cmd-queue-peaks'