Adding more tests and completing the three different paging strategies