Light refactoring to exhibits pagination tests.