Add new zend tests and fixes