reworked model tests