Make tests compile again.