Add tests and validation.