Working on unit tests for history