Fixed and enhanced reporting tests.