Reverted the history tests until a correct solution is found.