Now the tests compile again.