Fixes to Checkpoints Unit Tests