am 3235d8e4: am c52e54c4: Merge "Some more test cleanup."

* commit '3235d8e477e1a0ad72d22acfff7d9966f882daa6':
  Some more test cleanup.