Better cut heuristic and corresponding tests