Added more tests and validations