Fix reporter test
Extract common reporting methods