Improved test coverage, added test for HistoryReportForm