More small test case fixes. grr. cc #9629.