Issue #217: Update sample factory to use new test products
Issue #217: Update sample factory to use new test products

lizards-and-pumpkins/catalog,lizards-and-pumpkins/catalog,lizards-and-pumpkins/catalog