Merge "more test for Car" into nyc-car-dev