Manual sync with zend tests