Checkpoint.  Tests still don't work.