Zend_Navigation tests fixes

See individual commits for details