modified EntityJoinEventHandler test code and minor comments in base mod