Merge branch 'jk/test-helper-v-output-fix'