Fix two more tests
Fix comment and rename DatumSource to DatumCleanup, which seems clearer