Increased coverage for new variables/constraints container