Fixed generateRequestAndResponse - add port