updates to the model and the unit tests