Merge branch 'vi/make-test-vector-less-specific' into maint