checkpoint; pass more tests