Adds more constraints to the product model and tests for these