restore the merging tests.
Ensure write.lock shows on directory listings.