Simplify unit test scale
Better use of bind utility and product id instead of product