updates to product gateway, specs and tests