Modifications for unit-testing of the model.