improved model test & fixed some validation bug