Simplify reply handling
Add spec for returningBuffers:true