Modernize the model tests

same question