am 7bd28de5: Merge "Remove some crufty "core" tests."

* commit '7bd28de5781293b1b2b4224762bd909d097adbda':
  Remove some crufty "core" tests.