JavaDoccing
Moved EventCollector to testing project