GetReports tests and code reorg