am c52e54c4: Merge "Some more test cleanup."

* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.