Add calls to handle deletion of last-accessed entries; simple unit test