Simplify test/checkpoint