Merge pull request #8395 from jtattermusch/testing_nitpicking

A few test related fixes