update tests and validations