Update tests for VA/FV conversion