Work on execution listener tests