check pointing tests, pre-rebase with dev