Updated Models, Tests