add tests
modify validations