tidy up tests and vm handler, make (strange) correction to zend_do_end_expect