add additional validation rules on models and correct tests