diff --git a/Test/baseResults/lineContinuation.vert.out b/Test/baseResults/lineContinuation.vert.out
index 7f64cf14..87af5b45 100644
--- a/Test/baseResults/lineContinuation.vert.out
+++ b/Test/baseResults/lineContinuation.vert.out
@@ -19,7 +19,7 @@ ERROR: 0:112: '#if' : unexpected tokens following directive
 ERROR: 0:117: 'macro expansion' : end of line in macro substitution: FOOM
 ERROR: 0:118: 'preprocessor evaluation' : can't evaluate expression 
 ERROR: 0:118: '#if' : unexpected tokens following directive 
-ERROR: 0:147: '' :  syntax error
+ERROR: 0:150: '' :  syntax error
 ERROR: 19 compilation errors.  No code generated.
 
 
diff --git a/Test/baseResults/lineContinuation100.vert.out b/Test/baseResults/lineContinuation100.vert.out
index 63127933..642c2ae2 100644
--- a/Test/baseResults/lineContinuation100.vert.out
+++ b/Test/baseResults/lineContinuation100.vert.out
@@ -19,7 +19,8 @@ ERROR: 0:48: '@' : unexpected token
 ERROR: 0:50: 'line continuation' : not supported for this version or the enabled extensions 
 ERROR: 0:52: 'line continuation' : not supported for this version or the enabled extensions 
 ERROR: 0:53: '#error' : bad continuation  
-ERROR: 19 compilation errors.  No code generated.
+ERROR: 0:55: 'line continuation' : not supported for this version or the enabled extensions 
+ERROR: 20 compilation errors.  No code generated.
 
 
 ERROR: node is still EOpNull!
diff --git a/Test/baseResults/switch.frag.out b/Test/baseResults/switch.frag.out
index af810169..e69315f9 100644
--- a/Test/baseResults/switch.frag.out
+++ b/Test/baseResults/switch.frag.out
@@ -11,7 +11,10 @@ ERROR: 0:89: '' : break statement only allowed in switch and loops
 ERROR: 0:99: 'case' : cannot be nested inside control flow 
 ERROR: 0:104: 'case' : cannot be nested inside control flow 
 ERROR: 0:108: 'case' : cannot be nested inside control flow 
-ERROR: 12 compilation errors.  No code generated.
+ERROR: 0:115: 'default' : cannot be nested inside control flow 
+ERROR: 0:119: 'case' : cannot appear outside switch statement 
+ERROR: 0:120: 'default' : cannot appear outside switch statement 
+ERROR: 15 compilation errors.  No code generated.
 
 
 ERROR: node is still EOpNull!
@@ -218,12 +221,6 @@ ERROR: node is still EOpNull!
 0:97                case:  with expression
 0:97                  Constant:
 0:97                    1 (const int)
-0:99                case:  with expression
-0:99                  Constant:
-0:99                    4 (const int)
-0:104                case:  with expression
-0:104                  Constant:
-0:104                    2 (const int)
 0:?                 Sequence
 0:?                   Sequence
 0:100                    Branch: Break
@@ -251,18 +248,25 @@ ERROR: node is still EOpNull!
 0:107                    Compare Less Than (bool)
 0:107                      'd' (uniform mediump int)
 0:107                      'c' (uniform mediump int)
-0:107                    true case
-0:108                    case:  with expression
-0:108                      Constant:
-0:108                        3 (const int)
+0:107                    true case is null
 0:109                  Branch: Break
 0:111            Branch: Break
-0:112          default: 
+0:112          case:  with expression
+0:112            Constant:
+0:112              4 (const int)
 0:?           Sequence
 0:113            move second child to first child (highp float)
 0:113              'f' (highp float)
 0:113              tangent (highp float)
 0:113                'x' (smooth in highp float)
+0:114            Test condition and select (void)
+0:114              Condition
+0:114              Compare Less Than (bool)
+0:114                'f' (highp float)
+0:114                Constant:
+0:114                  0.000000
+0:114              true case is null
+0:116            Branch: Break
 0:?   Linker Objects
 0:?     'c' (uniform mediump int)
 0:?     'd' (uniform mediump int)
diff --git a/Test/cppSimple.vert b/Test/cppSimple.vert
index bb79568a..ed13815d 100644
--- a/Test/cppSimple.vert
+++ b/Test/cppSimple.vert
@@ -134,9 +134,9 @@ float twoPi = TWOPI;
 
 "boo" // ERROR
 int a = length("aoenatuh");  // ERROR
-
+#define QUOTE "abcd"  // okay
 'int';  // ERROR
-
+#define SINGLE 'a'   // okay
 // ERROR: all the following are reserved
 #define GL_
 #define GL_Macro 1
diff --git a/Test/lineContinuation.vert b/Test/lineContinuation.vert
index 42affcf2..f83212e2 100644
--- a/Test/lineContinuation.vert
+++ b/Test/lineContinuation.vert
@@ -140,6 +140,9 @@ void foo203209409()
 41;
 }
 
+#define QUOTE "ab\
+cd"
+
 void foo230920394()
 {
     // syntax error
diff --git a/Test/lineContinuation100.vert b/Test/lineContinuation100.vert
index 5bb112ac..32b19468 100644
--- a/Test/lineContinuation100.vert
+++ b/Test/lineContinuation100.vert
@@ -50,4 +50,7 @@ D;
 # \
 
 # \
-    error bad continuation
\ No newline at end of file
+    error bad continuation
+
+#define QUOTE "ab\
+cd"