Merge change 724 into donut

* changes:
  Split testSearchablesMocked into two tests.