Move limting and skipping of results into class method

To speed up testing, the skiping and limiting of results
has been moved into a class method. Enabling testing of
the limiting and skipping code without excuting a full
query