fixing tests and validations