Encode query string before sending it to Yamazaki
Fix tests