Change some truncates to deletes: truncate just not MVCC-safe enough yet.
Minor test adjustments