Unit test fixes
sync lock review fixes