Fix test fallout