diff --git a/tests/bad/2.3_token-recognition/unterminated-parameter.sh b/tests/bad/2.3_token-recognition/unterminated-parameter.sh
new file mode 100644
index 00000000..70f54982
--- /dev/null
+++ b/tests/bad/2.3_token-recognition/unterminated-parameter.sh
@@ -0,0 +1 @@
+${a-b |
diff --git a/tests/bad/2.3_token-recognition/unterminated-parameter.sh.open b/tests/bad/2.3_token-recognition/unterminated-parameter.sh.open
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/bad/here-document-and-quotes.sh b/tests/bad/here-document-and-quotes.sh
new file mode 100644
index 00000000..3441f954
--- /dev/null
+++ b/tests/bad/here-document-and-quotes.sh
@@ -0,0 +1,4 @@
+cat <<EOF
+a `b' c
+d `e' f `g' h
+EOF
diff --git a/tests/bad/here-document-and-quotes.sh.open b/tests/bad/here-document-and-quotes.sh.open
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/good/2.3-token-recognition/arithmetic-and-parentheses.sh b/tests/good/2.3-token-recognition/arithmetic-and-parentheses.sh
new file mode 100644
index 00000000..2b7ea31e
--- /dev/null
+++ b/tests/good/2.3-token-recognition/arithmetic-and-parentheses.sh
@@ -0,0 +1 @@
+$((((1-2)/3)*4))
diff --git a/tests/good/2.3-token-recognition/arithmetic-and-parentheses.sh.open b/tests/good/2.3-token-recognition/arithmetic-and-parentheses.sh.open
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/good/2.3-token-recognition/subshell_hash.sh b/tests/good/2.3-token-recognition/subshell_hash.sh
new file mode 100644
index 00000000..a4c644bc
--- /dev/null
+++ b/tests/good/2.3-token-recognition/subshell_hash.sh
@@ -0,0 +1 @@
+`a # b`
diff --git a/tests/good/2.3-token-recognition/subshell_hash.sh.open b/tests/good/2.3-token-recognition/subshell_hash.sh.open
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/good/2.4-reserved_words/keyword-after-keyword.sh b/tests/good/2.4-reserved_words/keyword-after-keyword.sh
new file mode 100644
index 00000000..1559249d
--- /dev/null
+++ b/tests/good/2.4-reserved_words/keyword-after-keyword.sh
@@ -0,0 +1,3 @@
+{ for foo in a b c; do
+      bar
+  done }
diff --git a/tests/good/2.4-reserved_words/keyword-after-keyword.sh.open b/tests/good/2.4-reserved_words/keyword-after-keyword.sh.open
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/good/fake-arithmetic.sh b/tests/good/fake-arithmetic.sh
new file mode 100644
index 00000000..2b2d5bec
--- /dev/null
+++ b/tests/good/fake-arithmetic.sh
@@ -0,0 +1,2 @@
+## Looks like an arithmetic expression but isn't
+$((a) || (b))
diff --git a/tests/good/fake-arithmetic.sh.open b/tests/good/fake-arithmetic.sh.open
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/good/you-should-not-see-this.sh b/tests/good/you-should-not-see-this.sh
new file mode 100644
index 00000000..fe4f9c6b
--- /dev/null
+++ b/tests/good/you-should-not-see-this.sh
@@ -0,0 +1,4 @@
+for a in $(b | c <<$d)
+do
+    e
+done
diff --git a/tests/good/you-should-not-see-this.sh.open b/tests/good/you-should-not-see-this.sh.open
new file mode 100644
index 00000000..e69de29b