Return pagination to last page of results

* Fix bug where pagination would be hidden on the last page
* Update pagination feature test to look for two sets of pagination
links
* Include missing 'then' in original page 2 scenario