Fix tests. Add assignments of vehicles to services