CLC-2754 Update CFV recording and make its tests stronger
Merge pull request #1794 from ctweney/clc-2754

CLC-2754 Update CFV recording and make its tests stronger