Fix failing proxy test

   * First commit cleans up deprecated warnings.
   * Second commit fixes a failing test.