Get most of the sync tests working