Fix for HistoryHash, and testcase updates to work with FF