Test General CV: general_cv simplified fold_num, make corresponding
changes in test