Enable write buffering
Fixed tests