Fixed modelClass tests
Merge pull request #72 from tanvirt/Ian

Fixed modelClass tests