Optimize imports, add new zend tests