Merge pull request #6381 from robertlacroix/vtx-unittest