Completely re-organized reporters, back to testthat essentially.