Add pagination and clean up tests

Thanks lawson!