checkpoint, unit test fixes post-refactor