ConcurrentModificationException fix.
Committing EdgeTrimmerTest and its resources.