Issue #1: checkpoint working through tests