Forgot to add important stuff
Renamed and changed events and test output system