Fixes tests broken in 9243e11