Modernize the model tests

I think this can actually be done before here after line 37