Fix tests after stdlib rearrangement