Add history including tests