Merge "Remove a test for an API I\'m removing." am: 0962ecd4e3
am: e3473f3a4c

* commit 'e3473f3a4c8b607524686859e1fefd4300de3a20':
  Remove a test for an API I'm removing.