Add more unit tests, rename Entry to CountBackEntry