finish removing test_entry_*_delete