improve model tests