diff --git a/tests/TODO b/tests/TODO
index bd04d1c..b0e429a 100644
--- a/tests/TODO
+++ b/tests/TODO
@@ -2,17 +2,18 @@ Cache
 Config
 Database
 Dynamic
-File
 Form
 HTML
 Log
 Model
 Module
-Number
 Object
 Profiler
 Security
 Session
 Validate
 
-Stuff in API directory
+API/AYAH
+API/Gravatar
+API/Tinychat
+API/Google/Profanity
diff --git a/tests/classes/FileTest.php b/tests/classes/FileTest.php
new file mode 100644
index 0000000..70d32c0
--- /dev/null
+++ b/tests/classes/FileTest.php
@@ -0,0 +1,20 @@
+<?php
+
+class FileTest extends PHPUnit_Framework_TestCase
+{
+	function testRemoveDirectory()
+	{
+		$directory = SITE_PATH . 'test/test/test/';
+
+		mkdir($directory, 0777, true);
+		touch(SITE_PATH . 'test/ing');
+		touch(SITE_PATH . 'test/test/ing');
+		touch(SITE_PATH . 'test/test/test/ing');
+
+		File::removeDirectory($directory);
+
+		$this->assertFalse(file_exists($directory));
+	}
+}
+
+?>
diff --git a/tests/classes/NumberTest.php b/tests/classes/NumberTest.php
new file mode 100644
index 0000000..3ee1513
--- /dev/null
+++ b/tests/classes/NumberTest.php
@@ -0,0 +1,50 @@
+<?php
+
+class NumberTest extends PHPUnit_Framework_TestCase
+{
+	/**
+	 * @dataProvider providerOrginalIndicatorNoSuper
+	 */
+	public function testOrdinalIndicatorNoSuper($a, $b)
+	{
+		$this->assertEquals($b, Number::ordinalIndicator($a));
+	}
+
+	public function providerOrginalIndicatorNoSuper()
+	{
+		return array(
+			array(1,  '1st'),
+			array(2,  '2nd'),
+			array(3,  '3rd'),
+			array(4,  '4th'),
+			array(51, '51st'),
+			array(52, '52nd'),
+			array(53, '53rd'),
+			array(54, '54th'),
+		);
+	}
+
+	/**
+	 * @dataProvider providerOrginalIndicatorSuper
+	 */
+	public function testOrdinalIndicatorSuper($a, $b)
+	{
+		$this->assertEquals($b, Number::ordinalIndicator($a, true));
+	}
+
+	public function providerOrginalIndicatorSuper()
+	{
+		return array(
+			array(1,  '1<sup>st</sup>'),
+			array(2,  '2<sup>nd</sup>'),
+			array(3,  '3<sup>rd</sup>'),
+			array(4,  '4<sup>th</sup>'),
+			array(51, '51<sup>st</sup>'),
+			array(52, '52<sup>nd</sup>'),
+			array(53, '53<sup>rd</sup>'),
+			array(54, '54<sup>th</sup>'),
+		);
+	}
+}
+
+?>