Added some more tests and validations