Fix broken tests from 9752f2b