Got model tests to work again