Fix up keep_disks/ping and add tests. refs #1581