diff --git a/manual/codes/Coding standards - PHP File Formatting - General.php b/manual/codes/Coding standards - PHP File Formatting - General.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - PHP File Formatting - Indentation.php b/manual/codes/Coding standards - PHP File Formatting - Indentation.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/codes/Coding standards - PHP File Formatting - Line termination.php b/manual/codes/Coding standards - PHP File Formatting - Line termination.php
new file mode 100644
index 000000000..d3f5a12fa
--- /dev/null
+++ b/manual/codes/Coding standards - PHP File Formatting - Line termination.php	
@@ -0,0 +1 @@
+
diff --git a/manual/codes/Coding standards - PHP File Formatting - Maximum line length.php b/manual/codes/Coding standards - PHP File Formatting - Maximum line length.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/manual/docs/Coding standards - Testing - Writing tests.php b/manual/docs/Coding standards - Testing - Writing tests.php
new file mode 100644
index 000000000..a3ab0dfca
--- /dev/null
+++ b/manual/docs/Coding standards - Testing - Writing tests.php	
@@ -0,0 +1,32 @@
+<b>CLASSES</b><br \><br \>
+<ul>
+<li \>
+All test classes should be referring to a class or specific testing aspect of some class.
+<br \><br \>
+For example <i>Doctrine_Record_TestCase</i> is a valid name since its referring to class named
+<i>Doctrine_Record</i>.
+<br \><br \>
+<i>Doctrine_Record_State_TestCase</i> is also a valid name since its referring to testing the state aspect
+of the Doctrine_Record class.
+<br \><br \>
+However something like <i>Doctrine_PrimaryKey_TestCase</i> is not valid since its way too generic.
+<br \><br \>
+<li \> All testcase classes should inherit Doctrine_UnitTestCase
+</ul>
+<br \><br \>
+<b>METHODS</b><br \><br \>
+<ul>
+<li \>All methods should support agile documentation; if some method failed it should be evident from the name of the test method what went wrong.
+Also the test method names should give information of the system they test.<br \><br \>
+For example <i>Doctrine_Export_Pgsql_TestCase::testCreateTableSupportsAutoincPks()</i> is a valid test method name. Just by looking at it we know
+what it is testing. Also we can run agile documentation tool to get little up-to-date system information.
+<br \><br \>
+NOTE: Commonly used testing method naming convention TestCase::test[methodName] is *NOT* allowed in Doctrine. So in this case
+<b class='title'>Doctrine_Export_Pgsql_TestCase::testCreateTable()</b> would not be allowed!
+<br \><br \>
+<li \>Test method names can often be long. However the content within the methods should rarely be more than dozen lines long. If you need several assert-calls
+divide the method into smaller methods.
+</ul>
+<b>ASSERTIONS</b><br \><br \>
+<ul>
+<li \>There should never be assertions within any loops and rarely within functions. 
diff --git a/manual/documentation.php b/manual/documentation.php
index 0494b1c18..f3a7db081 100644
--- a/manual/documentation.php
+++ b/manual/documentation.php
@@ -492,6 +492,12 @@ $menu = array('Getting started' =>
                                                 'Getting database declaration',
                                                 'Reserved keywords'),
                             ),
+            'Drivers' =>
+                array('Oracle' 
+                            => array('Making unsuported functions work'),
+                      'Mysql' 
+                            => array('Tips and tricks'),
+                      ),
             'Technology' => array(
                 'Architecture',
                 'Design patterns used',
@@ -537,7 +543,9 @@ $menu = array('Getting started' =>
                                     'Control statements',
                                     'Inline documentation'
                                     ),
-                                )
+                            'Testing' => array(
+                                    'Writing tests',
+                                ))
             );