[FOLD] Remove counted_bind
[FOLD] Convert more tests