checkpoint: all (uncommented) tests passing