reworked model tests pt 2