Fixing ConcurrentModificationException in tests
am: ec7c9178dd

* commit 'ec7c9178dd1f17cf8479acd4e0b4575a91cfb255':
  Fixing ConcurrentModificationException in tests