Merge "Modify tests to make them less fragile"
am: ef7e113e5a

* commit 'ef7e113e5a3ce3250c8968b9554b1db61023a31d':
  Modify tests to make them less fragile