Merge "Fix bad tests exposed by parallel reduction support." into nyc-dev