Product from constructor, unit-tests updated