Bug fixed in the tests. Checkpoints added