Fully embrace the container for events.
Add more tests.