everyone pull this
Merge pull request #7 from simensta/model-tests

everyone pull this