Sort lists of files for tests.
Fix wrong inclusion paths.