Model changed and unit test modified according to the new model.