Index: src/tests/.expect/LabelledExit.txt
===================================================================
--- src/tests/.expect/LabelledExit.txt	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
+++ src/tests/.expect/LabelledExit.txt	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -0,0 +1,3 @@
+CFA Version 1.0.0 (debug)
+Error: 'break' outside a loop or switch
+make: *** [LabelledExit] Error 1
Index: src/tests/Enum.c
===================================================================
--- src/tests/Enum.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/Enum.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,4 +1,4 @@
 //Testing enum declaration
-enum Colors {
+enum Colours {
 	Red,
 	Yellow,
@@ -10,4 +10,7 @@
 };
 
+enum Colours c1;
+Colours c2;
+
 void f( void ) {
 	enum Fruits {
@@ -17,9 +20,9 @@
 		Mango
 	} fruit = Mango;
+	enum Fruits f1;
+	Fruits f2;
 }
 
 //Dummy main
-int main(int argc, char const *argv[])
-{
-	return 0;
+int main(int argc, char const *argv[]) {
 }
Index: src/tests/Function.c
===================================================================
--- src/tests/Function.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ 	(revision )
@@ -1,32 +1,0 @@
-int a;
-float a;
-int f( int );
-float f( float );
-
-void g() {
-	// selects the same f each time but without a cast would be ambiguous
-	f( (int)a );
-	(int)f( a );
-}
-
-[ int ] p;
-[ int, double ] p;
-[ int, int, int ] p;
-[ int, int, int, int ] p;
-
-[ char ] q;
-[ int, int ] q;
-[ int, int, float ] q;
-[ int, int, int, int ] q;
-
-[ int, int ] r( int, int, int, int );
-
-void s() {
-	r( p, q );
-	r( [ q, p ] );
-	r( r( p, q ), r( q, q ) );
-}
-
-// Local Variables: //
-// tab-width: 4 //
-// End: //
Index: src/tests/GccExtensions.c
===================================================================
--- src/tests/GccExtensions.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/GccExtensions.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,49 +1,57 @@
-int main(int argc, char const *argv[])
-    asm( "nop" );
-    __asm( "nop" );
-    __asm__( "nop" );
+int main(int argc, char const *argv[]) {
+	asm( "nop" );
+	__asm( "nop" );
+	__asm__( "nop" );
 
-    __complex__ c1;
-    _Complex c2;
+	__complex__ c1;
+	_Complex c2;
 
-    const int i1;
-    __const int i2;
-    __const__ int i3;
+	const int i1;
+	__const int i2;
+	__const__ int i3;
 
-    __extension__ const int ex;
+	__extension__ const int ex;
+	struct S {
+		__extension__ int a, b, c;
+	};
+	int i = __extension__ 3;
+	__extension__ int a, b, c;
+	__extension__ a, __extension__ b, __extension__ c;
+	__extension__ a = __extension__ b + __extension__ c;
+	__extension__ a = __extension__ ( __extension__ b + __extension__ c );
 
-    __inline int f1();
-    __inline__ int f2();
+	__inline int f1() {}
+	__inline__ int f2() {}
 
-    __signed s1;
-    __signed s2;
+	__signed s1;
+	__signed s2;
 
-    __otypeof(s1) t1;
-    __otypeof__(s1) t2;
+	__typeof(s1) t1;
+	__typeof__(s1) t2;
 
-    __volatile int v1;
-    __volatile__ int v2;
+	__volatile int v1;
+	__volatile__ int v2;
 
-    __attribute__(()) int a1;
-    const __attribute(()) int a2;
-    const static __attribute(()) int a3;
-    const static int __attribute(()) a4;
-    const static int a5 __attribute(());
-    const static int a6, __attribute(()) a7;
+	__attribute__(()) int a1;
+	const __attribute(()) int a2;
+	const static __attribute(()) int a3;
+	const static int __attribute(()) a4;
+	const static int a5 __attribute(());
+	const static int a6, __attribute(()) a7;
 
-    int * __attribute(()) p1;
-    int (* __attribute(()) p2);
-//    int (__attribute(()) (p3));
-//    int ( __attribute(()) (* __attribute(()) p4));
+	int * __attribute(()) p1;
+	int (* __attribute(()) p2);
+//	int (__attribute(()) (p3));
+//	int ( __attribute(()) (* __attribute(()) p4));
 
-    struct __attribute(()) s1;
-    struct __attribute(()) s2 { int i; };
-    struct __attribute(()) s3 { int i; } x1, __attribute(()) y1;
-    struct __attribute(()) s4 { int i; } x2, y2 __attribute(());
+	struct __attribute(()) s1;
+	struct __attribute(()) s2 { int i; };
+	struct __attribute(()) s3 { int i; } x1, __attribute(()) y1;
+	struct __attribute(()) s4 { int i; } x2, y2 __attribute(());
 
-    int m1 [10] __attribute(());
-    int m2 [10][10] __attribute(());
-    int __attribute(()) m3 [10][10];
-//    int ( __attribute(()) m4 [10] )[10];
+	int m1 [10] __attribute(());
+	int m2 [10][10] __attribute(());
+	int __attribute(()) m3 [10][10];
+//	int ( __attribute(()) m4 [10] )[10];
 
 	return 0;
Index: src/tests/IdentFuncDeclarator.c
===================================================================
--- src/tests/IdentFuncDeclarator.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/IdentFuncDeclarator.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,10 +1,3 @@
 int main() {
-	//int f0[]();
-	//int (f0[])();
-	//int f0()[];
-	//int f0()();
-	//int (*f0)()();
-	//int ((*f0())())[];
-
 	int f1;
 	int (f2);
@@ -25,59 +18,59 @@
 	int (* const * const f14);
 
-	int f15[];
+	int f15[2];
 	int f16[10];
-	int (f17[]);
+	int (f17[2]);
 	int (f18[10]);
 
-	int *f19[];
+	int *f19[2];
 	int *f20[10];
-	int **f21[];
+	int **f21[2];
 	int **f22[10];
-	int * const *f23[];
+	int * const *f23[2];
 	int * const *f24[10];
-	int * const * const f25[];
+	int * const * const f25[2];
 	int * const * const f26[10];
 
-	int *(f27[]);
+	int *(f27[2]);
 	int *(f28[10]);
-	int **(f29[]);
+	int **(f29[2]);
 	int **(f30[10]);
-	int * const *(f31[]);
+	int * const *(f31[2]);
 	int * const *(f32[10]);
-	int * const * const (f33[]);
+	int * const * const (f33[2]);
 	int * const * const (f34[10]);
 
-	int (*f35[]);
+	int (*f35[2]);
 	int (*f36[10]);
-	int (**f37[]);
+	int (**f37[2]);
 	int (**f38[10]);
-	int (* const *f39[]);
+	int (* const *f39[2]);
 	int (* const *f40[10]);
-	int (* const * const f41[]);
+	int (* const * const f41[2]);
 	int (* const * const f42[10]);
 
-	int f43[][3];
+	int f43[2][3];
 	int f44[3][3];
-	int (f45[])[3];
+	int (f45[2])[3];
 	int (f46[3])[3];
-	int ((f47[]))[3];
+	int ((f47[2]))[3];
 	int ((f48[3]))[3];
 
-	int *f49[][3];
+	int *f49[2][3];
 	int *f50[3][3];
-	int **f51[][3];
+	int **f51[2][3];
 	int **f52[3][3];
-	int * const *f53[][3];
+	int * const *f53[2][3];
 	int * const *f54[3][3];
-	int * const * const f55[][3];
+	int * const * const f55[2][3];
 	int * const * const f56[3][3];
 
-	int (*f57[][3]);
+	int (*f57[2][3]);
 	int (*f58[3][3]);
-	int (**f59[][3]);
+	int (**f59[2][3]);
 	int (**f60[3][3]);
-	int (* const *f61[][3]);
+	int (* const *f61[2][3]);
 	int (* const *f62[3][3]);
-	int (* const * const f63[][3]);
+	int (* const * const f63[2][3]);
 	int (* const * const f64[3][3]);
 
Index: src/tests/IdentFuncParamDeclarator.c
===================================================================
--- src/tests/IdentFuncParamDeclarator.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/IdentFuncParamDeclarator.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,10 +1,3 @@
 int fred(
-	//int f0[](),
-	//int (f0[])(),
-	//int f0()[],
-	//int f0()(),
-	//int (*f0)()(),
-	//int ((*f0())())[],
-
 	int f1,
 	int (f2),
@@ -147,6 +140,5 @@
 	int * const *(f116[static const 3][3]),
 	int * const * const (f117[static const 3][3])
-	) {
-}
+    );
 
 //Dummy main
Index: src/tests/LabelledExit.c
===================================================================
--- src/tests/LabelledExit.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/LabelledExit.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,3 +1,3 @@
-int main() {
+int foo() {
   	int i;
   	int x, y;
@@ -130,5 +130,5 @@
 	}
 
-#if 0
+#if 1
   Q: if ( i > 5 ) {
 		i += 1;
Index: src/tests/NumericConstants.c
===================================================================
--- src/tests/NumericConstants.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/NumericConstants.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,54 +1,50 @@
 int main() {
-    1;							/* decimal */
-    2_1;
-    2_147_483_647;
-    37LL;
-    45ull;
-    89llu;
-    99LLu;
-    56_lu;
-    88_LLu;
+	1;							// decimal
+	2_1;
+	2_147_483_647;
+	37LL;
+	45ull;
+	89llu;
+	99LLu;
+	56_lu;
+	88_LLu;
 
-//    0;							/* octal */
-    0u;
-    0_3_77;
-    0_377_ul;
+//	0;							// octal
+	0u;
+	0_3_77;
+	0_377_ul;
 
-    0x1;						/* hexadecimal */
-    0x1u;
-    0xabL;
-    0x_80000000;
-    0x_fff;
-    0x_ef3d_aa5c;
-    0x_3LL;
+	0x1;						// hexadecimal
+	0x1u;
+	0xabL;
+	0x_80000000;
+	0x_fff;
+	0x_ef3d_aa5c;
+	0x_3LL;
 
-    3.;							/* integral real */
-    3_100.;
-    1_000_000.;
+	3.;							// integral real
+	3_100.;
+	1_000_000.;
 
-    3.1;						/* integral/fractional real */
-    3.141_592_654L;
-    123_456.123_456;
+	3.1;						// integral/fractional real
+	3.141_592_654L;
+	123_456.123_456;
 
-    3E1;						/* integral/exponent real */
-    3_e1f;
-    3_E1_1_F;
-    3_E_11;
-    3_e_+11;
-    3_E_-11;
+	3E1;						// integral/exponent real
+	3_e1f;
+	3_E1_1_F;
+	3_E_11;
+	3_e_+11;
+	3_E_-11;
 
-    3.0E1;						/* integral/fractional/exponent real */
-    3.0_E1L;
-    3.0_e1_1;
-    3.0_E_11_l;
-    3.0_e_+11l;
-    3.0_E_-11;
-    123_456.123_456E-16;
+	3.0E1;						// integral/fractional/exponent real
+	3.0_E1L;
+	3.0_e1_1;
+	3.0_E_11_l;
+	3.0_e_+11l;
+	3.0_E_-11;
+	123_456.123_456E-16;
 
-    0x_ff.ffp0;						/* hex real */
-    0x_1.ffff_ffff_p_128_l;
+	0x_ff.ffp0;					// hex real
+	0x_1.ffff_ffff_p_128_l;
 }
-
-// Local Variables: //
-// compile-command: "../../../bin/cfa -std=c99 NumericConstants.c" //
-// End: //
Index: src/tests/OccursError.c
===================================================================
--- src/tests/OccursError.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/OccursError.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,6 +1,8 @@
-forall( otype T ) void f( void (*)( T, T* ) );
-forall( otype U ) void g( U*, U );
+forall( otype T ) void f( void (*)( T, T * ) );
+forall( otype U ) void g( U,  U * );
+forall( otype U ) void h( U *, U );
 
 void test() {
+    f( h );
     f( g );
 }
Index: src/tests/Scope.c
===================================================================
--- src/tests/Scope.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/Scope.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -3,12 +3,17 @@
 typedef float t;
 y z;
-otype u = struct { int a; double b; };
+//otype u = struct { int a; double b; };
+typedef struct { int a; double b; } u;
 int f( int y );
 y q;
+struct x { int x; };
 
 y w( y y, u v ) {
-	otype x | { x t(u); };
+//	otype x | { x t(u); };
+	void ?{}(struct x *);
+	void ^?{}(struct x *);
+	extern struct x t( u );
 	u u = y;
-	x z = t(u);
+	struct x z = t(u);
 }
 
@@ -40,11 +45,13 @@
 }
 
+void some_func() {}
+
 t g( void ) {
 	typedef char x;
-	try {
+//	try {
 		some_func();
-	} catch ( x x ) {
-		t y = x;
-	}
+//	} catch ( x x ) {
+//		t y = x;
+//	}
 	x z;
 }
Index: src/tests/ShortCircuit.c
===================================================================
--- src/tests/ShortCircuit.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/ShortCircuit.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -1,8 +1,4 @@
-int ?!=?( int, int );
-int ?!=?( float, float );
-int 0;
-
-void g( float );
-void g( int );
+void g( float f ) {}
+void g( int i ) {}
 
 void f( int a ) {
@@ -14,5 +10,4 @@
 }
 
-//Dummy main
 int main(int argc, char const *argv[])
 {
Index: src/tests/StructMember.c
===================================================================
--- src/tests/StructMember.c	(revision 6bc4734f7814e3b8c0b88cfe6548251fc5fc45e4)
+++ src/tests/StructMember.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -10,5 +10,4 @@
 	int (*m10)();
 	int *(*m11)(int);
-	T T;
 	T (T);
 
Index: src/tests/Tuples.c
===================================================================
--- src/tests/Tuples.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
+++ src/tests/Tuples.c	(revision 10dc7491a667863c329eca8e88d748bc09b5f0ea)
@@ -0,0 +1,32 @@
+int a;
+float a;
+int f( int );
+float f( float );
+
+void g() {
+	// selects the same f each time but without a cast would be ambiguous
+	f( (int)a );
+	(int)f( a );
+}
+
+[ int ] p;
+[ int, double ] p;
+[ int, int, int ] p;
+[ int, int, int, int ] p;
+
+[ char ] q;
+[ int, int ] q;
+[ int, int, float ] q;
+[ int, int, int, int ] q;
+
+[ int, int ] r( int, int, int, int );
+
+void s() {
+	r( p, q );
+	r( [ q, p ] );
+	r( r( p, q ), r( q, q ) );
+}
+
+// Local Variables: //
+// tab-width: 4 //
+// End: //