Add TODO:
- We use this class as base class for most tests so TestBaseClass would be a better name
- We should do this after event-notifications has been merged to reduce the merge complexity.