add validations..tests pass