Support for rewinding history and more tests