(#1844) - Only clean up the tests after suite is complete
(#1846) - Dont write checkpoint when replication is cancelled