- restore original state of event_scheduler at the end of the test
- minor fixes around comments, formatting