added constants and generic event aggregator + tests