diff-delta: fold two special tests into one plus cleanups