Re-added pagination, uncommented tests
All tests running and passing