3 files changed, 7 insertions, 11 deletions
diff --git a/modules/aggregator/aggregator.test b/modules/aggregator/aggregator.test
index cac3b9069..282f0e868 100644
--- a/modules/aggregator/aggregator.test
+++ b/modules/aggregator/aggregator.test
@@ -151,8 +151,7 @@ class AggregatorTestCase extends DrupalWebTestCase {
 EOF;
 
     $path = file_directory_path() . '/valid-opml.xml';
-    file_save_data($opml, $path);
-    return $path;
+    return file_save_data($opml, $path);
   }
 
   /**
@@ -169,8 +168,7 @@ EOF;
 EOF;
 
     $path = file_directory_path() . '/invalid-opml.xml';
-    file_save_data($opml, $path);
-    return $path;
+    return file_save_data($opml, $path);
   }
 
   /**
@@ -192,8 +190,7 @@ EOF;
 EOF;
 
     $path = file_directory_path() . '/empty-opml.xml';
-    file_save_data($opml, $path);
-    return $path;
+    return file_save_data($opml, $path);
   }
 
   function getRSS091Sample() {
@@ -226,8 +223,7 @@ EOF;
 EOT;
 
     $path = file_directory_path() . '/rss091.xml';
-    file_save_data($feed, $path);
-    return $path;
+    return file_save_data($feed, $path);
   }
 }
 
diff --git a/modules/color/color.module b/modules/color/color.module
index c7dbc35c5..be280bb62 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -308,9 +308,9 @@ function color_scheme_form_submit($form, &$form_state) {
   foreach ($info['copy'] as $file) {
     $base = basename($file);
     $source = $paths['source'] . $file;
-    file_copy($source, $paths['target'] . $base);
+    $filepath = file_copy($source, $paths['target'] . $base);
     $paths['map'][$file] = $base;
-    $paths['files'][] = $paths['target'] . $base;
+    $paths['files'][] = $filepath;
   }
 
   // Render new images, if image has been provided.
diff --git a/modules/simpletest/tests/file.test b/modules/simpletest/tests/file.test
index 33fdcfb49..d7154712c 100644
--- a/modules/simpletest/tests/file.test
+++ b/modules/simpletest/tests/file.test
@@ -128,7 +128,7 @@ class FileValidateTest extends DrupalWebTestCase {
     }
 
     // Clear out any resizing messages.
-#    drupal_get_messages();
+    drupal_get_messages();
   }
 
   /**