new per-file test-case
Merge branch 'testing'