Multidir tests 5

[Against multidir]

Tests for the checkpoint handlers, and a few miscellaneous fixes.