added virtuals to models and tests
Merge pull request #1 from topherchristie/master

added virtuals to models and tests