Model update + tests