added more tests, validations