add more history test coverage and remove the hardcode of the history
merge the History test file