[FOLD] test fixes