Added option for using vectorized distributions and tests