checkpoint: Rework tests.
checkpoint: Basically working.