Add pagination and clean up tests

Thanks lawson!
Ah good point. Thanks Lawson. Users messing with params again!