Add some tests and validations