Updated history output
updated tests