Added ConcurrentHashMap, added basic tests