Fixes styling changes
Fixes shuffle write metrics when merge sort is bypassed
Passes all shuffle suites