Added a few validations
More tests