Add product validation and test