Some tweaks to history while trying to figure out the extra visit in test-basic