Merge "Small fixes for vmv_v_i test"