Fix unit test that didn't actually test anything and add test for multiple property saves.
Do check if metadata file exists inside file lock to avoid race conditions