Add validation and Test Units