make tests compile and pass again