Fix model tests