Merge "add cubes test" into nyc-car-dev