Improved model test