Mild fixes

Make test socket server more robust
Allow return of multiple buffers