Revision of the model and corresponding tests.