Checkpoint with more test coverage