updated testing and validations