checkpoint -- add more tests