Minor fixes to set_product and the related test fixture
Uncomment out test assertion