Add model tests and validations