Fix tests broken in 255f058.