=== modified file 'aat.test'
--- aat.test	2015-09-03 19:57:24 +0000
+++ aat.test	2015-09-03 16:24:08 +0000
@@ -3,7 +3,6 @@
 Hello world!
 >>>
 printf "%s", "Hello world!\n"
->>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -11,7 +10,6 @@
 |BEGIN {print "Hello world!"}
 >>>
 BEGIN {print "Hello world!"}
->>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -19,7 +17,6 @@
 Hello {{name}}!
 >>>
 printf "%s", "Hello " (name) "!\n"
->>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -27,7 +24,6 @@
 Hello {<name>}!
 >>>
 printf "%s", "Hello " (<name>) "!\n"
->>>2
 >>>= 0
 
 ./bin/aat.awk
@@ -35,5 +31,4 @@
 Hello {<a<b<c>>>}!
 >>>
 printf "%s", "Hello " (<a<b<c>>>) "!\n"
->>>2
 >>>= 0

=== modified file 'aat_data.test'
--- aat_data.test	2015-09-03 19:57:24 +0000
+++ aat_data.test	2015-09-03 16:24:08 +0000
@@ -8,5 +8,4 @@
 name=world
 >>>
 Hello world!
->>>2
 >>>= 0

=== modified file 'aat_simple.test'
--- aat_simple.test	2015-09-03 19:57:24 +0000
+++ aat_simple.test	2015-09-03 16:24:08 +0000
@@ -5,7 +5,6 @@
 |}
 >>>
 Hello world!
->>>2
 >>>= 0
 
 ./bin/aat -
@@ -16,5 +15,4 @@
 |}
 >>>
 Hello world!
->>>2
 >>>= 0

=== modified file 'bin/query.awk'
--- bin/query.awk	2015-09-03 19:57:24 +0000
+++ bin/query.awk	2013-10-30 21:03:06 +0000
@@ -84,10 +84,8 @@
 				out("\"")
 			} else {
 				if(DEBUG) printf "q: →%s← →%s←\n", last_out, line >"/dev/stderr"
-				if( \
-					match(last_out, /[[( \n\t]$/) && \
-					match(line, /^<([a-zA-Z0-9._<>]|'[^']*')*>/) \
-				) {
+				if(match(last_out, /[\n\t([ ]$/) && \
+				   match(line, /^<([a-zA-Z0-9._<>]|'[^']*')*>/)) {
 					expand_remaining = substr(line, 2, RLENGTH-2)
 					line = substr(line, RLENGTH+1)
 					out(expand_query())

=== modified file 'query.test'
--- query.test	2015-09-03 19:57:24 +0000
+++ query.test	2015-09-03 16:24:08 +0000
@@ -5,7 +5,6 @@
 >>>
 BEGIN {
 }
->>>2
 >>>= 0
 
 ./q
@@ -13,7 +12,6 @@
 	foo(<bar>)
 >>>
 	foo(get("bar"))
->>>2
 >>>= 0
 
 ./q
@@ -21,7 +19,6 @@
 	x[<y<z>>] = <a'b()'>
 >>>
 	x[get("y"get("z"))] = get("a"(b()))
->>>2
 >>>= 0
 
 ./q
@@ -29,7 +26,6 @@
 	y = ""
 >>>
 	y = ""
->>>2
 >>>= 0
 
 ./q
@@ -37,7 +33,6 @@
 	y = (y) (<c:>)
 >>>
 	y = (y) ((find("c")?found:""))
->>>2
 >>>= 0
 
 ./q
@@ -45,7 +40,6 @@
 	y = (y) (<d:'0'>)
 >>>
 	y = (y) ((find("d")?found:(0)))
->>>2
 >>>= 0
 
 ./q
@@ -53,7 +47,6 @@
 	y = (y) (<e:<f>>)
 >>>
 	y = (y) ((find("e")?found:get("f")))
->>>2
 >>>= 0
 
 ./q
@@ -61,7 +54,6 @@
 	y = (y) (<g:<h:<i>>>)
 >>>
 	y = (y) ((find("g")?found:(find("h")?found:get("i"))))
->>>2
 >>>= 0
 
 ./q
@@ -69,7 +61,6 @@
 	y = (y) (<g:<h:<i:'<j> - (<k:'0'>)'>>>)
 >>>
 	y = (y) ((find("g")?found:(find("h")?found:(find("i")?found:(get("j") - ((find("k")?found:(0))))))))
->>>2
 >>>= 0
 
 ./q
@@ -77,7 +68,6 @@
 	y = (y) (<g:<h:<i:'(<j>) - (<k:'0'>)'>>>)
 >>>
 	y = (y) ((find("g")?found:(find("h")?found:(find("i")?found:((get("j")) - ((find("k")?found:(0))))))))
->>>2
 >>>= 0
 
 ./q
@@ -85,7 +75,6 @@
 	y = (y) (<a|C:'"r\n"'>)
 >>>
 	y = (y) ((find("a")?C(found):("r\n")))
->>>2
 >>>= 0
 
 ./q
@@ -93,7 +82,6 @@
 	y = (y) (<a|C:"r\n">)
 >>>
 	y = (y) ((find("a")?C(found):"r\n"))
->>>2
 >>>= 0
 
 ./q
@@ -101,5 +89,4 @@
 	y = (y) (<a|C>)
 >>>
 	y = (y) (C(get("a")))
->>>2
 >>>= 0

=== modified file 'testloop'
--- testloop	2015-09-03 19:57:24 +0000
+++ testloop	2015-09-03 16:24:08 +0000
@@ -12,7 +12,7 @@
 test_args=( "$@" )
 
 do_test() {
-	shelltest *.test -c "$test_args[@]"
+	shelltest -ap *.test -c "$test_args[@]" -- -j8 -o1
 	# time py.test "$test_args"
 }