Merge "Fix vif tests"