Lesser refactoring of camelot test listener.
Merge branch 'master' into internal