Add more validation and unit tests