Updated all failing model tests