Added validations for the new models
Writing tests
Writing tests