Updated Listener tests to support PR changes