Put test file names in correct order
Merge branch 'master' into bounded