Refactoring - inline send buffers in UTs