Fix failing model tests