Paging tests + modifications to make them pass (incomplete)