am b4db7923: Merge "Delete some obsolete test code."

* commit 'b4db7923818393c5c839dba0d43bec36da98759c':
  Delete some obsolete test code.