Adding a couple enhacements on the Paginator api + some renaming for more clear code + helper methods for tests