Rename test files, as per moritz' request