Index: tests/concurrent/.expect/keywordErrors.nast.txt
===================================================================
--- tests/concurrent/.expect/keywordErrors.nast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
+++ tests/concurrent/.expect/keywordErrors.nast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
@@ -0,0 +1,6 @@
+concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread A with body
+
+concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread B with body
+
Index: tests/concurrent/.expect/keywordErrors.oast.txt
===================================================================
--- tests/concurrent/.expect/keywordErrors.oast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
+++ tests/concurrent/.expect/keywordErrors.oast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
@@ -0,0 +1,6 @@
+concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread A: with body 1
+
+concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread B: with body 1
+
Index: tests/concurrent/.expect/keywordErrors.txt
===================================================================
--- tests/concurrent/.expect/keywordErrors.txt	(revision eb3bc528997e6f7c0319bb7a75aa224152546e3f)
+++ 	(revision )
@@ -1,6 +1,0 @@
-concurrent/keywordErrors.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread A: with body 1
-
-concurrent/keywordErrors.cfa:6:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
-thread B: with body 1
-
Index: tests/concurrent/.expect/mainError.nast.txt
===================================================================
--- tests/concurrent/.expect/mainError.nast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
+++ tests/concurrent/.expect/mainError.nast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
@@ -0,0 +1,11 @@
+concurrent/mainError.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread Test with body
+
+concurrent/mainError.cfa:2:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+main: function
+... with parameters
+  reference to instance of struct Test with body
+... returning nothing
+ with body
+  Compound Statement:
+
Index: tests/concurrent/.expect/mainError.oast.txt
===================================================================
--- tests/concurrent/.expect/mainError.oast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
+++ tests/concurrent/.expect/mainError.oast.txt	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
@@ -0,0 +1,11 @@
+concurrent/mainError.cfa:1:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+thread Test: with body 1
+
+concurrent/mainError.cfa:2:1 error: thread keyword requires threads to be in scope, add #include <thread.hfa>
+main: function
+... with parameters
+  reference to instance of struct Test with body 1
+... returning nothing
+... with body
+  CompoundStmt
+
Index: tests/concurrent/mainError.cfa
===================================================================
--- tests/concurrent/mainError.cfa	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
+++ tests/concurrent/mainError.cfa	(revision 510e6f9430710d9525c9d3b03d0d08e6f2fe2de9)
@@ -0,0 +1,2 @@
+thread Test {};
+void main(Test&) {}