Add pagination and clean up tests

Thanks lawson!
Think I should add? Yesterday I had a check before that someone said was redundant. I'll add though, I think that is clearer