Add more test cases for split path on overlapping (ref #720)
Repair broken tests (ref #720)