Fix paging in test suite