add more test and refactor some method in activity
disable the historytest for now