Reporting refactor, part 5: rewrite tests

They needed to be... As a result of the refactoring however, reports cannot be
mocked anymore for the basic tests.