updating CollabMap with changes in refactoring branch.
updated collabMapTest with changes of refactoring branch
update EventTargetTest with changes of refactoring branch