Refactor Checkpoints, add test
Merge branch 'jira-127b' of https://github.com/gcberger/scalatest