Implemented this TODO note (last one for ConcurrentArrayList) and added unit tests for it