extra tests and cleaning for include_constraints