Renamed test files to put in sensible directories.