Merge changes I4c2acb80,Ib4ccd1be

* changes:
  Use AtomicFile
  Assert there is only one data folder created during test (1/n)