Merge change 3011 into donut

* changes:
  simplify this test