Merge "Split large-ops into three tests so each has its own timeout"