Have split out checkpoint vs. restore tests, ast they're kind of mutually exclusive.