model updates and test updates