Update: Changed report creation logic.

Update: Changed report creation logic.
Initial: Added 2 tests