Fix errors in some tests after v2.3.