Improved model tests