Fix issues with EntryLister, unit tests now pass again