Move the stuff that Virtus does for us to spec/integration