GitHub #137: Checkpoint -- Working on tests and shutdown cleanup