Rewrite four test cases to use the new vocabulary

- In main-internal in particular, we never actually tested intra-binary
  call.  Now we do.
13 files changed