Improve the model tests a bit