Restore test files

Ease the process of merging in upstream changes.