Adapt unit tests to changed slack evaluation
Merge branch 'master' into genericHeuristic