echo samples modification - connection close

+ tests