Fixing ConcurrentModificationException in tests

Change-Id: I7aabc62aa249dae979366ce2871604f5822f3139
1 file changed