Moved unit test to the right package
With the new location
Fixed events thread which was no longer set up