Added AccountHistory tests
Merge origin/master