Modernize the model tests