Fixing query parameters on GET, fixing tests