Fixed history view, small test refactoring