Index: src/tests/.expect/declarationErrors.txt
===================================================================
--- src/tests/.expect/declarationErrors.txt	(revision 9f70ab57e9b76f554f66f776331f1a9a40295901)
+++ src/tests/.expect/declarationErrors.txt	(revision 7d05e7e1d81b9041e298ff69ebfbf7fdff9b0733)
@@ -1,65 +1,69 @@
 CFA Version 1.0.0 (debug)
-Error: invalid combination of storage classes in declaration of x9: static const volatile short int 
+Error: duplicate static in declaration of x1: static const volatile short int 
 
-Error: invalid combination of storage classes in declaration of x18: static const volatile instance of const volatile struct __anonymous0
+Error: multiple extern & static in declaration of x2: extern const volatile short int 
+
+Error: multiple extern & auto, multiple extern & static, multiple extern & static, duplicate extern in declaration of x3: extern const volatile short int 
+
+Error: duplicate static in declaration of x4: static const volatile instance of const volatile struct __anonymous0
   with members 
    with body 
 
 
-Error: duplicate qualifier volatile in declaration of x19: static const volatile instance of const volatile struct __anonymous1
+Error: duplicate const, duplicate static, duplicate volatile in declaration of x5: static const volatile instance of const volatile struct __anonymous1
   with members 
    with body 
 
 
-Error: invalid combination of storage classes in declaration of x28: static const volatile instance of type Int
+Error: duplicate static in declaration of x6: static const volatile instance of type Int
 
-Error: duplicate qualifier const in declaration of f01: static inline function
+Error: duplicate const in declaration of f01: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier volatile in declaration of f02: static inline function
+Error: duplicate volatile in declaration of f02: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier const in declaration of f03: static inline function
+Error: duplicate const in declaration of f03: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier volatile in declaration of f04: static inline function
+Error: duplicate volatile in declaration of f04: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier const in declaration of f05: static inline function
+Error: duplicate const in declaration of f05: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier volatile in declaration of f06: static inline function
+Error: duplicate volatile in declaration of f06: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier const in declaration of f07: static inline function
+Error: duplicate const in declaration of f07: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier const, volatile in declaration of f08: static inline function
+Error: duplicate const, duplicate volatile in declaration of f08: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier const, volatile in declaration of f09: static inline function
+Error: duplicate const, duplicate volatile in declaration of f09: static inline function
   with no parameters 
   returning const volatile int 
 
 
-Error: duplicate qualifier const, volatile in declaration of f09: static inline function
+Error: duplicate const, duplicate _Atomic, duplicate _Atomic, duplicate const, duplicate restrict, duplicate volatile in declaration of f09: static inline function
   with no parameters 
-  returning const volatile int 
+  returning const restrict volatile _Atomic int 
 
 
Index: src/tests/declarationErrors.c
===================================================================
--- src/tests/declarationErrors.c	(revision 9f70ab57e9b76f554f66f776331f1a9a40295901)
+++ src/tests/declarationErrors.c	(revision 7d05e7e1d81b9041e298ff69ebfbf7fdff9b0733)
@@ -10,13 +10,15 @@
 // Created On       : Wed Aug 17 08:23:43 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 25 18:16:40 2016
-// Update Count     : 5
+// Last Modified On : Fri Sep  9 22:57:52 2016
+// Update Count     : 31
 // 
 
-static short int volatile static const x9;				// duplicate static
-struct { int i; } const static volatile static x18;		// duplicate static
-struct { int i; } const static volatile static volatile x19; // duplicate static & volatile
+static short int volatile static const x1;				// duplicate static
+extern short int static volatile const x2;				// multiple extern & static
+extern short int auto static volatile static extern const x3; // duplicate and multiple storage classes
+struct { int i; } const static volatile static x4;		// duplicate static
+struct { int i; } const static volatile const static volatile x5; // duplicate static & const & volatile
 typedef int Int;
-static Int volatile static const x28;					// duplicate static
+static Int volatile static const x6;					// duplicate static
 
 const static inline const volatile int f01();			// duplicate const
@@ -24,11 +26,11 @@
 const inline const volatile int static f03();			// duplicate const
 volatile inline static const volatile int f04();		// duplicate volatile
-const static const inline volatile int f05();			// duplicate const
-volatile static const volatile inline int f06();		// duplicate volatile
-const static const volatile int inline f07();			// duplicate const
-volatile static const int inline const volatile f08();		// duplicate volatile
+const static int const inline volatile f05();			// duplicate const
+volatile int static const volatile inline f06();		// duplicate volatile
+const static const int volatile inline f07();			// duplicate const
+volatile static const int inline const volatile f08();	// duplicate volatile
 
-volatile static const int inline const volatile f09();		// duplicate volatile
-volatile static const int inline const volatile f09();		// duplicate volatile
+volatile static const int inline const volatile f09();	// duplicate volatile
+_Atomic _Atomic _Atomic volatile restrict static const const int inline restrict const volatile f09();	// duplicate volatile
 
 //Dummy main
