Improved test for current couchbase datapath