more tests and validations