Add new zend tests, fixes