dry model tests
Merge branch 'master' into shadi-test
Merging to stay up to date
minor change
tests are dried up
Merge pull request #52 from fox-squirrels-2013/shadi-test

Shadi test