Merge "Add unit tests for file persisting in Onwers."