Fix broken tests caused by d27d4d9