diff --git a/tests/2/Test.zwei b/tests/2/Test.zwei
new file mode 100755
index 0000000..2637788
--- /dev/null
+++ b/tests/2/Test.zwei
@@ -0,0 +1,24 @@
+class factoriel {
+
+        String var1;
+        String toString(){
+                var1 = 25;
+                if(x == -2) var1 -- 2 else var1 - 3;
+                var1 = 30;
+                var --2;
+
+                while(-2 == -5){
+                        if(-4 == -6) var --2 else var + (-4 + -5);
+                        var2 = (5- var2 )  + nimportequoi;
+                }
+        }
+}
+
+class test{
+        factoriel monfact;
+
+        String toString() {
+                monfact.soString(4, 5, 5);
+        }
+} 
+2 == 4 
diff --git a/tests/2/Test2.zwei b/tests/2/Test2.zwei
new file mode 100755
index 0000000..cf15969
--- /dev/null
+++ b/tests/2/Test2.zwei
@@ -0,0 +1,32 @@
+class A extends B {
+        //Check FieldDecl (-> also Formal)
+        Int a;
+        Int s;
+        Null z;
+        Object o;
+        boolean b;
+
+        //Check MethodDef
+        Object method(Int i, Null n, Object oj) {
+                //Check Block (->also Statement and Expression)
+                while ( if ( i && !o) { return  b} else { return !b}) {
+                        b = true;
+                        boolean c = false;
+                        3+2;
+                        printInt (a);
+                        printChar("toto et titi c'est tjs joli");
+                }
+
+                // Expression
+                if ( b) readInt else readChar;
+                if (-b) true else false;
+                if(a-b || c) null else ( a == b);
+                if (-new x (3,"HelloWorld") * ! { while ( a==b) { 4 //Comment
+                                % 3 ;  }return "viveJava"} / b && c) null;
+
+
+                return b
+        }
+}
+
+7.a(b,c,d,e)
diff --git a/tests/2/Test3.zwei b/tests/2/Test3.zwei
new file mode 100755
index 0000000..ead822d
--- /dev/null
+++ b/tests/2/Test3.zwei
@@ -0,0 +1,30 @@
+//Fun with Expressions, Statements and Factors
+//this file should be correct
+class FunTest {
+
+        formal formal() {
+
+                ident.ident.ident.ident;
+                //ident.new ident().34."valais rulez".true.this.{hello;}.bla();
+                printInt({});
+                printChar(!"a");
+
+                while ({}) {}
+                while (("da da da")) {this.dududu == true;}
+                while (34.da) {{};}
+
+                if ( expr ) expr else expr;
+
+                exrp  == expr;
+                expr == term --factor * ! factor;
+
+                {} == ({});
+                {} && {} <= {};
+
+                {}.bla();
+                {{};} * new bla ({return {return bla}});   
+        }
+
+}
+
+test 
diff --git a/tests/2/Test4.zwei b/tests/2/Test4.zwei
new file mode 100755
index 0000000..d9a28ae
--- /dev/null
+++ b/tests/2/Test4.zwei
@@ -0,0 +1,21 @@
+// no class, complex expression
+
+{
+    {
+        if (y.fait.beau())
+            parasol
+        else
+            parapluie;
+        return goutte
+    };
+    if (if (jour) lampe.eteinte() else lamp.allumee()) petrole;
+    if (new chien(Blond, grand, if (taille!=petit) lourd else leger) && chien.poilue) golden;
+    -new animal().chat --(new animal()).chat;
+    Null Nullident = null;
+    if (expr) if (expr) 1 else 2 ;
+    if (expr) if (expr) 1 else 2 else 3 ;
+    if (expr) if (expr) 1 else if (2) 3 else 4 ;
+    if (expr) (if (expr) 1 else if (2) 3 else 4) ;
+    if (expr) (((if (expr)1))) else if (2) 3 else 4 ;
+    return rien
+}