Fixing ConcurrentModificationException in tests am: ec7c9178dd
am: 93229c40bc

* commit '93229c40bc1cf31c9864a6e4948b8479790345bc':
  Fixing ConcurrentModificationException in tests