Fix test-wrapping in product (bug 969162)