Added all tests for the model.
Slightly modified the model.