Improve model tests for issues