fixes in history (part1) and e2e tests