Test classes and ConcurrentModificationException fix