Improve management of vm for tests
Merge branch 'master' of github.com:octo-technology/master-chef