Update unit tests for sync locking.
More fixtheths
review fix