More tests for various things

* Changes because of api changes
* Testing the event listeners