Improve test coverage - will update for OM later
Simplify manager class to only do grouping
Use manager for Events
Use ObjectManager for Timestamps
Bring event stuff up to date
Track quorums with ObjectManager