Fix tests for the constraint solver after the interface change