Unused use statement removed
Test case moved into tests folder
Event tests added