Fix infrastructure tests