Made vhost test platform agnostic