A few more fixes for undo file.  Split test in two parts so that it doesn't
fail with tiny features.
16 files changed