Adding CollectionUtils and tests