Add pagination and clean up tests

Thanks lawson!
That is nicer, dropping in