Fixing tests for buffered messages; throughput is still bad, maybe something's wrong