fixes tests after Nicolas' change was reverted