fix broken specs, add more specs for different query string encodings