Added some tests for pagination & cleaned said pagination up.