Corrections and unit tests for split bug.