diff --git a/libraries/ArduinoTestSuite/examples/ATS_SD_File/ATS_SD_File.pde b/libraries/ArduinoTestSuite/examples/ATS_SD_File/ATS_SD_File.pde
new file mode 100644
index 000000000..95527fefd
--- /dev/null
+++ b/libraries/ArduinoTestSuite/examples/ATS_SD_File/ATS_SD_File.pde
@@ -0,0 +1,94 @@
+// Tests writing to and reading from a file, in particular the
+// the Stream implementation (e.g. read() and peek()).
+
+#include <SD.h>
+#include <ArduinoTestSuite.h>
+
+void setup()
+{
+  int startMemoryUsage = ATS_GetFreeMemory();
+  boolean b;
+  File f;
+  
+  ATS_begin("Arduino", "SD Test");
+  
+  ATS_PrintTestStatus("SD.begin()", b = SD.begin(4));
+  if (!b) goto done;
+  
+  f = SD.open("test.txt", true, false);
+  ATS_PrintTestStatus("SD.open()", f);
+  if (!f) goto done;
+  
+  f.print("abcdefgh");
+  f.close();
+  
+  f = SD.open("test.txt");
+  ATS_PrintTestStatus("SD.open()", f);
+  if (!f) goto done;
+
+  ATS_PrintTestStatus("read()", f.read() == 'a');
+  ATS_PrintTestStatus("peek()", f.peek() == 'b');
+  ATS_PrintTestStatus("read()", f.read() == 'b');
+  ATS_PrintTestStatus("read()", f.read() == 'c');
+  ATS_PrintTestStatus("peek()", f.peek() == 'd');
+  ATS_PrintTestStatus("peek()", f.peek() == 'd');
+  ATS_PrintTestStatus("peek()", f.peek() == 'd');
+  ATS_PrintTestStatus("peek()", f.peek() == 'd');
+  ATS_PrintTestStatus("read()", f.read() == 'd');
+  ATS_PrintTestStatus("available()", f.available() != 0);
+  ATS_PrintTestStatus("read()", f.read() == 'e');
+  ATS_PrintTestStatus("available()", f.available() != 0);
+  ATS_PrintTestStatus("peek()", f.peek() == 'f');
+  ATS_PrintTestStatus("read()", f.read() == 'f');
+  ATS_PrintTestStatus("peek()", f.peek() == 'g');
+  ATS_PrintTestStatus("available()", f.available() != 0);
+  ATS_PrintTestStatus("peek()", f.peek() == 'g');
+  ATS_PrintTestStatus("read()", f.read() == 'g');
+  ATS_PrintTestStatus("available()", f.available() != 0);
+  ATS_PrintTestStatus("available()", f.available() != 0);
+  ATS_PrintTestStatus("available()", f.available() != 0);
+  ATS_PrintTestStatus("peek()", f.peek() == 'h');
+  ATS_PrintTestStatus("read()", f.read() == 'h');
+  ATS_PrintTestStatus("available()", f.available() == 0);
+  ATS_PrintTestStatus("peek()", f.peek() == -1);
+  ATS_PrintTestStatus("read()", f.read() == -1);
+  ATS_PrintTestStatus("peek()", f.peek() == -1);
+  ATS_PrintTestStatus("read()", f.read() == -1);
+  
+  f.close();  
+
+  f = SD.open("test2.txt", true, false);
+  ATS_PrintTestStatus("SD.open()", f);
+  if (!f) goto done;
+  
+  f.print("ABC");
+  f.close();
+
+  f = SD.open("test.txt");
+  ATS_PrintTestStatus("SD.open()", f);
+  if (!f) goto done;
+  
+  ATS_PrintTestStatus("peek()", f.peek() == 'a');
+  
+  f.close();
+  
+  f = SD.open("test2.txt");
+  ATS_PrintTestStatus("SD.open()", f);
+  if (!f) goto done;
+  
+  ATS_PrintTestStatus("peek()", f.peek() == 'A');
+  ATS_PrintTestStatus("read()", f.read() == 'A');
+
+  f.close();
+
+done:
+  ATS_ReportMemoryUsage(startMemoryUsage);
+  ATS_end();
+
+}
+
+void loop() {}
+
+
+
+
diff --git a/libraries/ArduinoTestSuite/examples/ATS_SD_Files/ATS_SD_Files.pde b/libraries/ArduinoTestSuite/examples/ATS_SD_Files/ATS_SD_Files.pde
new file mode 100644
index 000000000..50a7a741d
--- /dev/null
+++ b/libraries/ArduinoTestSuite/examples/ATS_SD_Files/ATS_SD_Files.pde
@@ -0,0 +1,78 @@
+#include <SD.h>
+#include <ArduinoTestSuite.h>
+
+void setup()
+{
+  int startMemoryUsage = ATS_GetFreeMemory();
+  boolean b;
+  File f;
+  
+  ATS_begin("Arduino", "SD Files Test");
+  
+  ATS_PrintTestStatus("SD.begin()", b = SD.begin(4));
+  if (!b) goto done;
+  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf.txt"));
+  ATS_PrintTestStatus("SD.open()", f = SD.open("asdf.txt", true)); f.close();
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf.txt"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("/asdf.txt"));
+  ATS_PrintTestStatus("SD.remove()", SD.remove("asdf.txt"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf.txt"));
+  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf"));
+  ATS_PrintTestStatus("SD.mkdir()", SD.mkdir("asdf"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("/asdf"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf/"));  
+  ATS_PrintTestStatus("SD.rmdir()", SD.rmdir("asdf"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf"));
+
+  ATS_PrintTestStatus("SD.mkdir()", SD.mkdir("x/y/z"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x/"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x/y"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x/y/"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x/y/z"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x/y/z/"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("/x/y/z/"));  
+  ATS_PrintTestStatus("SD.rmdir()", SD.rmdir("x/y/z"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x"));  
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x/y"));  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("x/y/z"));  
+  ATS_PrintTestStatus("SD.rmdir()", SD.rmdir("x/y/"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("x"));  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("x/y"));  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("x/y/z"));  
+  ATS_PrintTestStatus("SD.rmdir()", SD.rmdir("/x"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("x"));  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("x/y"));  
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("x/y/z"));  
+  
+  ATS_PrintTestStatus("!SD.open()", !(f = SD.open("asdf/asdf.txt", true))); f.close();
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf.txt"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf/asdf.txt"));
+  ATS_PrintTestStatus("SD.mkdir()", SD.mkdir("asdf"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf"));
+  ATS_PrintTestStatus("SD.open()", f = SD.open("asdf/asdf.txt", true)); f.close();
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf/asdf.txt"));
+  ATS_PrintTestStatus("!SD.rmdir()", !SD.rmdir("asdf"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf/asdf.txt"));
+  ATS_PrintTestStatus("SD.remove()", SD.remove("asdf/asdf.txt"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf/asdf.txt"));
+  ATS_PrintTestStatus("SD.exists()", SD.exists("asdf"));
+  ATS_PrintTestStatus("SD.rmdir()", SD.rmdir("asdf"));
+  ATS_PrintTestStatus("!SD.exists()", !SD.exists("asdf"));
+  
+done:
+  ATS_ReportMemoryUsage(startMemoryUsage);
+  ATS_end();
+
+}
+
+void loop() {}
+
+
+
+
diff --git a/libraries/SD/utility/examples/clean.bat b/libraries/SD/utility/examples/clean.bat
deleted file mode 100644
index 782a4986a..000000000
--- a/libraries/SD/utility/examples/clean.bat
+++ /dev/null
@@ -1,2 +0,0 @@
-rm -r */applet
-pause
\ No newline at end of file