CLC-2668 Fix failing CFV test

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