Correctly claim unclaimed hunks for boundary
Ignore blank line origins (for now)
Improve test failure output