Fixed design of toolbox for product
#54 tests on toolbox