Iss #31 - Fix pagination calls for common edge case

Current code will fail if the query string starts with the page data. This should address this issue, and also adds testing to help guard against regression.