Fix/model tests