Added more tests, validations