more model updates with unit tests