Minor restructuring of reports manager.
Functioning test class.