update and finish model tests