Updated product validation, along with the functional and unit test