Re-Add Reporting + Reporting.Tests