Add more checkpoints and test change keys