Decreased memory requirements of new tests added in issue21448.