Fix history and revert test files.