Merge "Reinstate tests for wedge partition selection optimizations." into nextgenv2