Merge "Fix and re-enable Dumps' checkpoint tests"