Correct failing model tests