Merge "Modify tests to make them less fragile" am: ef7e113e5a am: 3a4992f11e
am: 7f2b92c094

* commit '7f2b92c0941787f73101ec20b63c292679764442':
  Modify tests to make them less fragile