Merge "Add a corpus of test files"