Refactored the Test structure for reports