fix some multi-file tests

I had a little trouble with some of the tests which were added in latest release 2.7 (dea2f1b6). Here I have two patches to fix this.