Update specs and parameters for the new vhost stuff
Add lots of example tests