am ecdce8c6: am e21ff23d: am 77ae9511: Further refinement of the alarm batching test

* commit 'ecdce8c6955e8a664813cffa9254a24a77d89453':
  Further refinement of the alarm batching test