[CF] Test fixes and speedup