Edit changed the query to automatically add the limit and skip functions
Add Added tests to check for both a limit and an offset