CLC-2754 Update CFV recording and make its tests stronger

https://jira.media.berkeley.edu/jira/browse/CLC-2754