Add test for manualintegrate u-sub heuristic
Further simplify manualintegrate u-sub heuristic