[FOLD] unit test tweaks