Add tests for nested query strings