am 5fb7c3e2: Merge "Remove some obviously useless tests (and fix the others so they build)."

* commit '5fb7c3e2503a1eaba370cb0a111448c2975584af':
  Remove some obviously useless tests (and fix the others so they build).