Test - Augment Model tests
Model - Add validations