Added in Validations
Changing tests