Fixing unit tests for synchronize due to earlier changes