Upgrading Model tests