Index: src/tests/Cast.c
===================================================================
--- src/tests/Cast.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Cast.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -9,5 +9,5 @@
 	(int)f;
 	(void(*)())f;
-	([long, long double, *[]()])([f, f, f]);
+//	([long, long double, *[]()])([f, f, f]);
 }
 
Index: src/tests/CommentMisc.c
===================================================================
--- src/tests/CommentMisc.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/CommentMisc.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -1,40 +1,2 @@
-/* single line */
-// single line
-
-// single line containing */
-// single line containing /*
-// single line containing /* */
-
-/* 1st */ int i;
-int i; /* 2nd */
-/* 1st */ int i; /* 2nd */
-/* 1st */ /* 2nd */
-
-/* 1st
-   2nd */ int i;
-
-/*
-*/
-
-/*
-
-*/
-
-/*
-  1st
-*/
-
-/*
-  1st
-  2nd
-*/
-
-// ignore preprocessor directives
-
-#line 2
- #
- #include <fred>
-	#define mary abc
-
 // alternative ANSI99 brackets
 
Index: src/tests/Constant0-1.c
===================================================================
--- src/tests/Constant0-1.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Constant0-1.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -1,4 +1,3 @@
-//Constant test declaration
-// Cforall extension
+// Constant test declaration
 
 // value
@@ -6,18 +5,35 @@
 int 0;
 const int 0;
-static const int 0;
 int 1;
 const int 1;
-static const int 1;
-int 0, 1;
-const int 0, 1;
+struct { int i; } 0;
+const struct { int i; } 1;
+
+#ifdef DUPS
+
+int 0;
+const int 0;
+int 1;
+const int 1;
 int (0), (1);
 int ((0)), ((1));
-static const int 0, 1;
+const int 0, 1;
+const int (0), (1);
 struct { int i; } 0;
 const struct { int i; } 1;
-static const struct { int i; } 1;
+
+#endif // DUPS
+
+#ifndef NEWDECL
 
 // pointer
+
+int *0, *1;
+int * const (0), * const 1;
+struct { int i; } *0;
+const struct { int i; } *0;
+int (*(* const x)), **0;
+
+#ifdef DUPS
 
 int *0, *1;
@@ -28,5 +44,13 @@
 int (* const 0), (* const 1);
 int ((* const 0)), ((* const 1));
+int (*(* const x)), *(*0);
+int (*(* const x)), (*(*0));
 struct { int i; } *0;
+const struct { int i; } *0;
+int (*(* const x)), **0;
+
+#endif // DUPS
+
+#else
 
 // Cforall style
@@ -34,14 +58,22 @@
 * int x, 0;
 const * int x, 0;
-static const * int x, 0;
 * struct { int i; } 0;
 const * struct { int i; } 0;
-static const * struct { int i; } 0;
-static * int x, 0;
-static const * int x, 0;
 const * * int x, 0;
 
+#ifdef DUPS
+
+* int x, 0;
+const * int x, 0;
+
+#endif // DUPS
+
+#endif // NEWDECL
+
 int main() {
+#ifndef NEWDECL
     int 1, * 0;
+#else
     * int x, 0;
+#endif // NEWDECL
 }
Index: src/tests/Context.c
===================================================================
--- src/tests/Context.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Context.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -1,9 +1,9 @@
-//cforall context declaration
-context has_q( otype T ) {
+// trait declaration
+trait has_q( otype T ) {
 	T q( T );
 };
 
 forall( otype z | has_q( z ) ) void f() {
-	context has_r( otype T, otype U ) {
+	trait has_r( otype T, otype U ) {
 		T r( T, T (T,U) );
 	};
Index: src/tests/Exception.c
===================================================================
--- src/tests/Exception.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Exception.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -10,5 +10,5 @@
     try {
 	x/4;
-    } catch( int) {
+    } catch( int ) {
     } catch( int x ) {
     } catch( struct { int i; } ) {
Index: src/tests/Expression.c
===================================================================
--- src/tests/Expression.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Expression.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -1,11 +1,6 @@
-int fred() {
-    struct s { int i; } *p;
-    int i;
+int main() {
+    struct s { int i; } x, *p = &x;
+    int i = 3;
 
-    // order of evaluation (GCC is different)
-/*
-    i = sizeof( (int) {3} );
-    i = sizeof (int) {3};
-*/
     // operators
 
@@ -42,9 +37,9 @@
     i||i;
     p->i;
-    i+=i;
-    i-=i;
     i*=i;
     i/=i;
     i%=i;
+    i+=i;
+    i-=i;
     i&=i;
     i|=i;
@@ -54,20 +49,3 @@
 
     i?i:i;
-
-    // cast
-/*
-    double d;
-    int *ip;
-    (int *) i;
-    (* int) i;
-    ([char, int *])[d, d];
-    [i,ip,ip] = ([int, * int, int *])[1,(void *)2,(void *)3];
-    [i,ip,ip] = ([int, * int, int *])([1,(void *)2,(void *)3]);
-*/
-}
-
-//Dummy main
-int main(int argc, char const *argv[])
-{
-	return 0;
-}
+} // main
Index: src/tests/Forall.c
===================================================================
--- src/tests/Forall.c	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Forall.c	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -46,5 +46,5 @@
 }
 
-context sumable( otype T ) {
+trait sumable( otype T ) {
 	const T 0;
 	T ?+?(T, T);
Index: src/tests/Makefile.am
===================================================================
--- src/tests/Makefile.am	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Makefile.am	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -11,6 +11,6 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Jan 25 22:31:42 2016
-## Update Count     : 25
+## Last Modified On : Mon Jun 20 14:30:52 2016
+## Update Count     : 33
 ###############################################################################
 
@@ -23,2 +23,11 @@
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c
 avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
+
+Constant0-1DP : Constant0-1.c
+	${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
+
+Constant0-1ND : Constant0-1.c
+	${CC} ${CFLAGS} -DNEWDECL ${<} -o ${@}
+
+Constant0-1NDDP : Constant0-1.c
+	${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
Index: src/tests/Makefile.in
===================================================================
--- src/tests/Makefile.in	(revision 9724df0f43a87e20fa080814d05c61fa7c184fce)
+++ src/tests/Makefile.in	(revision a0dcd2edcadf2ff42b6ab01a0c906832947262c0)
@@ -621,4 +621,13 @@
 
 
+Constant0-1DP : Constant0-1.c
+	${CC} ${CFLAGS} -DDUPS ${<} -o ${@}
+
+Constant0-1ND : Constant0-1.c
+	${CC} ${CFLAGS} -DNEWDECL ${<} -o ${@}
+
+Constant0-1NDDP : Constant0-1.c
+	${CC} ${CFLAGS} -DNEWDECL -DDUPS ${<} -o ${@}
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.