Checkpoint: add tests plus other work