Fix failing test from #818 and add History entry.