Merge change Iacd79b8a

* changes:
  Avoid shadowing fields from the superclass testcase.