Hotfix/zend queue 16

All local tests (without actual busses) now pass.