Rename some files. Minor change in testing function.