Fix sync unit test
Merge branch 'master' into project-metadata