Improve diff output of numeric keys and add tests for split diffs