Merge "Add vand_vi unit test"