Make distinct 1D and 2D versions of the unfolding tests