Again try to improve Sync tests #8539

Merged

ayumi merged 1 commit into master from fix/test-syncing-then-turning-it-off-2

May 2, 2017