Merge change 889 into donut

* changes:
  Broaden the search for native test files.