Merge "Fix install location for vendor tests"