Merge "Fix Vehicle_test"