Fixes tests broken by 968eede