Reporting: Test fixes and tweaks