Allow paginated to work with list results.
Fixed tests to work with query based paginated results.