some refactoring in tests
merge
add get history