Add tests and validations for model