Add pagination and some tests.