Improve error message if we encounter invalid/unexpected files in integration tests Adjust some tests slightly