Fixed binding scope in addListener / on methods. Added proper tests.