Better file processing, new test data