Update CollectSampleRepository tests (#155)
Update ProductType mapping in Product (#155)