Partial test_fold commit (potential n_fold bug)