made suitable for Vagrant AND added rerun failed support