Add more tests and validation.