review model and unit tests