Moved EventCollector to testing project