Event listener tests + some tweaks