Make tests build again.