Fixed and enhanced some reporting tests.