Add non-contiguous shuffle and cluster expansion planner test