Fixes tests broken in 34f74d55