Checkpointing some test infrastructure