fix most tests in Zend, three remain