Moved these files to the appropriate test directories.