Ensure reporters work
Merge branch 'bugs/fix-reporter-15'