fixed template and tests to adhere to EGPaginator logic