Fixing key-value-based file systems for the rename test.

Also fixing a slight bug in the rename test.