Add validation and test