Resolved all current concurrency bugs. No more random null pointer/ concurrentModificationException failures in unit tests due to issues with threading and synchronization.