history unit tests
merge