Fix tests. Add Vehicle assemblies