Increasing delay to make plugin_test less flaky
Moved scheduler out of plugin, added better testing
Removing unnecessary super calls
Re-enabling alarm tests
Merge branch 'master' into logging