Make Model tests green