Moved ModelTests into unit tests, failing