Make tests compile again.

Make tests compile again.