[FOLD] unit test fixes