diff --git a/tests/C/test-20-circular-2/bake/Bakefile b/tests/C/test-20-circular-2/bake/Bakefile
new file mode 100644
index 0000000..f917268
--- /dev/null
+++ b/tests/C/test-20-circular-2/bake/Bakefile
@@ -0,0 +1,10 @@
+all: A
+
+A: B C
+	echo "Building A"
+
+B: C
+	echo "Building B"
+
+C: A
+	echo "Building C"
diff --git a/tests/C/test-20-circular-2/bake/Bakefile:Zone.Identifier b/tests/C/test-20-circular-2/bake/Bakefile:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-20-circular-2/bake/bakefile.jar:Zone.Identifier b/tests/C/test-20-circular-2/bake/bakefile.jar:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-20-circular-2/bakefile.jar:Zone.Identifier b/tests/C/test-20-circular-2/bakefile.jar:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-20-circular-2/make/Makefile b/tests/C/test-20-circular-2/make/Makefile
new file mode 100644
index 0000000..f917268
--- /dev/null
+++ b/tests/C/test-20-circular-2/make/Makefile
@@ -0,0 +1,10 @@
+all: A
+
+A: B C
+	echo "Building A"
+
+B: C
+	echo "Building B"
+
+C: A
+	echo "Building C"
diff --git a/tests/C/test-20-circular-2/make/Makefile:Zone.Identifier b/tests/C/test-20-circular-2/make/Makefile:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-21-generate/bake/Bakefile b/tests/C/test-21-generate/bake/Bakefile
new file mode 100644
index 0000000..82ad519
--- /dev/null
+++ b/tests/C/test-21-generate/bake/Bakefile
@@ -0,0 +1,8 @@
+all: output.txt
+
+output.txt: generate.sh
+	bash generate.sh > output.txt
+
+generate.sh:
+	echo "echo 'Hello, World!'" > generate.sh
+	chmod +x generate.sh
diff --git a/tests/C/test-21-generate/bake/Bakefile:Zone.Identifier b/tests/C/test-21-generate/bake/Bakefile:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-21-generate/bake/bakefile.jar:Zone.Identifier b/tests/C/test-21-generate/bake/bakefile.jar:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-21-generate/bakefile.jar:Zone.Identifier b/tests/C/test-21-generate/bakefile.jar:Zone.Identifier
new file mode 100644
index 0000000..e69de29
diff --git a/tests/C/test-21-generate/make/Makefile b/tests/C/test-21-generate/make/Makefile
new file mode 100644
index 0000000..82ad519
--- /dev/null
+++ b/tests/C/test-21-generate/make/Makefile
@@ -0,0 +1,8 @@
+all: output.txt
+
+output.txt: generate.sh
+	bash generate.sh > output.txt
+
+generate.sh:
+	echo "echo 'Hello, World!'" > generate.sh
+	chmod +x generate.sh
diff --git a/tests/C/test-21-generate/make/Makefile:Zone.Identifier b/tests/C/test-21-generate/make/Makefile:Zone.Identifier
new file mode 100644
index 0000000..e69de29