Added test dependencies
Allow passing of query/sort as string (and convert to JSON from that)
Merge pull request #1 from bamse16/master

Allow passing of query/sort as string (and convert to JSON from that)