Add more unit testing around entry listing