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

* commit '3a4992f11e0eb7e315e8f46bae3dcc2b0debe7b6':
  Modify tests to make them less fragile