Merge "Remove unnecessary current context from reusable sync tests" into nyc-dev