refactored tests on all models
Merge pull request #13 from GeoffPurdy/master

refactored tests on all models