AndReporter, TestMoreReporter
Moved types to files.