fixing paging, testing