eliminate a few more local variables
sort filenames when they get inlined into the test, for smaller diffs