Refactor specs
Finish updating Virtus