Modified model with tests.