Merge "Remove a test for an API I'm removing."