Fixes tests broken in bdf023d