Lesser refactoring of camelot test listener.