Fixes model tests