Issue #1: checkpoint working on tests