am 37da3f0d: am 7bd28de5: Merge "Remove some crufty "core" tests."
automerge: c1c4edf

* commit 'c1c4edf129d984be20aa79af2d5d6f8d881e2f26':
  Remove some crufty "core" tests.