make tests for sync branch pass