diff --git a/tests/imports/scope_mess.d b/tests/imports/scope_mess.d
index 56a885e..4776876 100644
--- a/tests/imports/scope_mess.d
+++ b/tests/imports/scope_mess.d
@@ -4,4 +4,7 @@ class FooTest
 {
     void member1() { int b; }
     void member2() in {} do {}
+    void member3() in(true) out(a; true) do {}
+    void member4() out(; things) do {}
+    void member5() do {}
 }
diff --git a/tests/imports/tc620_import.d b/tests/imports/tc620_import.d
new file mode 100644
index 0000000..45a3d7c
--- /dev/null
+++ b/tests/imports/tc620_import.d
@@ -0,0 +1,12 @@
+struct UselessStruct
+{
+    static if (true)
+    {
+        unittest {}
+    }
+
+private:
+
+}
+
+int someNumber;
diff --git a/tests/tc620/expected.txt b/tests/tc620/expected.txt
new file mode 100644
index 0000000..73a40ab
--- /dev/null
+++ b/tests/tc620/expected.txt
@@ -0,0 +1,2 @@
+identifiers
+someNumber	v
diff --git a/tests/tc620/file.d b/tests/tc620/file.d
new file mode 100644
index 0000000..166e016
--- /dev/null
+++ b/tests/tc620/file.d
@@ -0,0 +1 @@
+import tc620_import; some
diff --git a/tests/tc620/run.sh b/tests/tc620/run.sh
new file mode 100755
index 0000000..ea7d14c
--- /dev/null
+++ b/tests/tc620/run.sh
@@ -0,0 +1,5 @@
+set -e
+set -u
+
+../../bin/dcd-client $1 file.d -c25 > actual.txt
+diff actual.txt expected.txt
diff --git a/tests/tc_scope_mess/expected1.txt b/tests/tc_scope_mess/expected1.txt
index 1cb5cf9..9f16d3d 100644
--- a/tests/tc_scope_mess/expected1.txt
+++ b/tests/tc_scope_mess/expected1.txt
@@ -7,6 +7,9 @@ init	k
 mangleof	k
 member1	f
 member2	f
+member3	f
+member4	f
+member5	f
 sizeof	k
 stringof	k
 tupleof	k