fix tests
new inference: tweaks to order additional constraints
Merge remote-tracking branch 'origin/master'