More tests and validations