More testing changes including an event listener change to include the
machine on which an event occurred, which is useful when dealing with
submachines.