#353 Fixes to request-response test for #339 #340 #341