Modify events to module
More some tests