Pagination Test Fixes

Let's see if this sorts it out then.