Hotfix/zend queue 13

Fixes most unit tests.