Merge "Handle invalid configuration for vif test execution"