Fix failing view/model tests