Added validation with model test