updated tests and validations