Make tests compile and pass again