Pagination and test correction