Validation: add tests