Merge "Add tests/test-data/ to test file list for Checkstyle"