Event binding fixes
Setting up some tests