Autoloading fix and extended tests for events