123 files changed, 75 insertions, 66 deletions

diff --git a/myrpki.rototill/yamltest.py b/myrpki.rototill/yamltest.py
index 360f6ad7..08153209 100644
--- a/myrpki.rototill/yamltest.py
+++ b/myrpki.rototill/yamltest.py
@@ -548,7 +548,7 @@ try:
   rpki.log.use_syslog = False
   rpki.log.init("yamltest")
 
-  yaml_file = argv[0] if argv else "../rpkid/testbed.1.yaml"
+  yaml_file = argv[0] if argv else "../rpkid/tests/testbed.1.yaml"
 
   # Allow optional config file for this tool to override default
   # passwords: this is mostly so that I can show a complete working
diff --git a/rpkid/Makefile b/rpkid/Makefile
index f2884ff2..177aae79 100644
--- a/rpkid/Makefile
+++ b/rpkid/Makefile
@@ -1,12 +1,5 @@
 # $Id$
 
-all:: left-right-protocol-samples/.stamp
-
-left-right-protocol-samples/.stamp: left-right-protocol-samples.xml split-protocol-samples.xsl 
-	rm -f left-right-protocol-samples/*.xml
-	xsltproc --stringparam dir left-right-protocol-samples split-protocol-samples.xsl left-right-protocol-samples.xml
-	touch $@
-
 all:: left-right-schema.rng
 
 rpki/relaxng.py: left-right-schema.rng
@@ -21,13 +14,6 @@ rpki/relaxng.py: up-down-schema.rng
 up-down-schema.rng: up-down-schema.rnc
 	trang up-down-schema.rnc up-down-schema.rng
 
-all:: publication-protocol-samples/.stamp
-
-publication-protocol-samples/.stamp: publication-protocol-samples.xml split-protocol-samples.xsl 
-	rm -f publication-protocol-samples/*.xml
-	xsltproc --stringparam dir publication-protocol-samples split-protocol-samples.xsl publication-protocol-samples.xml
-	touch $@
-
 all:: publication-schema.rng 
 
 rpki/relaxng.py: publication-schema.rng
@@ -45,22 +31,22 @@ install:
 dont-run-trang:
 	touch *.rng
 
-relaxng: left-right-protocol-samples/.stamp left-right-schema.rng up-down-schema.rng publication-protocol-samples/.stamp publication-schema.rng
-	xmllint --noout --relaxng  left-right-schema.rng  left-right-protocol-samples/*.xml
-	xmllint --noout --relaxng     up-down-schema.rng     up-down-protocol-samples/*.xml
-	xmllint --noout --relaxng publication-schema.rng publication-protocol-samples/*.xml
+relaxng: left-right-schema.rng up-down-schema.rng publication-schema.rng
+	cd tests; $(MAKE) protocol-samples
+	xmllint --noout --relaxng  left-right-schema.rng  tests/left-right-protocol-samples/*.xml
+	xmllint --noout --relaxng     up-down-schema.rng     tests/up-down-protocol-samples/*.xml
+	xmllint --noout --relaxng publication-schema.rng tests/publication-protocol-samples/*.xml
 
 unit-tests: all
 	PWD=`pwd`; for i in rpki/*.py; do echo "[$$i]"; PYTHONPATH=$$PWD python $$i; done
 
 all-tests:: unit-tests
 
-parse-test: all
-	python xml-parse-test.py
-
 all-tests:: relaxng
 
-all-tests:: parse-test
+test all-tests parse-test::
+	cd tests; $(MAKE) $@
+
 
 irbe_cli.usage: irbe_cli.py
 	python irbe_cli.py --help | sed 's/^/      /' >$@
@@ -74,29 +60,6 @@ rpki/relaxng.py: make-relaxng.py
 	python make-relaxng.py >$@.tmp
 	mv $@.tmp $@
 
-# all-tests:: all; sh -x rootd.sh run
-
-all-tests:: all
-	python testbed.py -y testbed.1.yaml
-
-all-tests:: all
-	python testbed.py -y testbed.2.yaml
-
-test all-tests:: all
-	python testbed.py -y testbed.3.yaml
-
-all-tests:: all
-	python testbed.py -y testbed.4.yaml
-
-all-tests:: all
-	python testbed.py -y testbed.5.yaml
-
-test all-tests:: all
-	python testbed.py -y testbed.6.yaml
-
-all-tests:: all
-	python testbed.py -y testbed.7.yaml
-
 # Documentation
 
 doc/irdbd.dot: irdbd.sql
diff --git a/rpkid/tweak-doc.xsl b/rpkid/doc/tweak-doc.xsl
index e5abd7e9..e5abd7e9 100644
--- a/rpkid/tweak-doc.xsl
+++ b/rpkid/doc/tweak-doc.xsl
diff --git a/rpkid/tests/Makefile b/rpkid/tests/Makefile
new file mode 100644
index 00000000..e005f65a
--- /dev/null
+++ b/rpkid/tests/Makefile
@@ -0,0 +1,44 @@
+# $Id$
+
+all: protocol-samples
+
+clean:
+	rm -rf testbed.dir left-right-protocol-samples/*.xml publication-protocol-samples/*.xml
+
+protocol-samples: left-right-protocol-samples/.stamp publication-protocol-samples/.stamp
+
+left-right-protocol-samples/.stamp: left-right-protocol-samples.xml split-protocol-samples.xsl 
+	rm -f left-right-protocol-samples/*.xml
+	xsltproc --stringparam dir left-right-protocol-samples split-protocol-samples.xsl left-right-protocol-samples.xml
+	touch $@
+
+publication-protocol-samples/.stamp: publication-protocol-samples.xml split-protocol-samples.xsl 
+	rm -f publication-protocol-samples/*.xml
+	xsltproc --stringparam dir publication-protocol-samples split-protocol-samples.xsl publication-protocol-samples.xml
+	touch $@
+
+parse-test: protocol-samples
+	python xml-parse-test.py
+
+all-tests:: parse-test
+
+all-tests:: 
+	python testbed.py -y testbed.1.yaml
+
+all-tests::
+	python testbed.py -y testbed.2.yaml
+
+test all-tests::
+	python testbed.py -y testbed.3.yaml
+
+all-tests::
+	python testbed.py -y testbed.4.yaml
+
+all-tests::
+	python testbed.py -y testbed.5.yaml
+
+test all-tests::
+	python testbed.py -y testbed.6.yaml
+
+all-tests::
+	python testbed.py -y testbed.7.yaml
diff --git a/rpkid/tests/POW b/rpkid/tests/POW
new file mode 120000
index 00000000..5ddce7b5
--- /dev/null
+++ b/rpkid/tests/POW
@@ -0,0 +1 @@
+../POW
\ No newline at end of file
diff --git a/rpkid/left-right-protocol-samples.xml b/rpkid/tests/left-right-protocol-samples.xml
index 0adc74da..0adc74da 100644
--- a/rpkid/left-right-protocol-samples.xml
+++ b/rpkid/tests/left-right-protocol-samples.xml
diff --git a/rpkid/left-right-protocol-samples/.stamp b/rpkid/tests/left-right-protocol-samples/.stamp
index e69de29b..e69de29b 100644
--- a/rpkid/left-right-protocol-samples/.stamp
+++ b/rpkid/tests/left-right-protocol-samples/.stamp
diff --git a/rpkid/left-right-protocol-samples/pdu.001.xml b/rpkid/tests/left-right-protocol-samples/pdu.001.xml
index 78de7752..78de7752 100644
--- a/rpkid/left-right-protocol-samples/pdu.001.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.001.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.002.xml b/rpkid/tests/left-right-protocol-samples/pdu.002.xml
index 11b622af..11b622af 100644
--- a/rpkid/left-right-protocol-samples/pdu.002.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.002.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.003.xml b/rpkid/tests/left-right-protocol-samples/pdu.003.xml
index 62cf22a0..62cf22a0 100644
--- a/rpkid/left-right-protocol-samples/pdu.003.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.003.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.004.xml b/rpkid/tests/left-right-protocol-samples/pdu.004.xml
index 207848a0..207848a0 100644
--- a/rpkid/left-right-protocol-samples/pdu.004.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.004.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.005.xml b/rpkid/tests/left-right-protocol-samples/pdu.005.xml
index e78343a7..e78343a7 100644
--- a/rpkid/left-right-protocol-samples/pdu.005.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.005.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.006.xml b/rpkid/tests/left-right-protocol-samples/pdu.006.xml
index a89f6346..a89f6346 100644
--- a/rpkid/left-right-protocol-samples/pdu.006.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.006.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.007.xml b/rpkid/tests/left-right-protocol-samples/pdu.007.xml
index 66cb88ce..66cb88ce 100644
--- a/rpkid/left-right-protocol-samples/pdu.007.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.007.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.008.xml b/rpkid/tests/left-right-protocol-samples/pdu.008.xml
index 65fd27ea..65fd27ea 100644
--- a/rpkid/left-right-protocol-samples/pdu.008.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.008.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.009.xml b/rpkid/tests/left-right-protocol-samples/pdu.009.xml
index e5034072..e5034072 100644
--- a/rpkid/left-right-protocol-samples/pdu.009.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.009.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.010.xml b/rpkid/tests/left-right-protocol-samples/pdu.010.xml
index 76c4e668..76c4e668 100644
--- a/rpkid/left-right-protocol-samples/pdu.010.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.010.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.011.xml b/rpkid/tests/left-right-protocol-samples/pdu.011.xml
index ee785f6b..ee785f6b 100644
--- a/rpkid/left-right-protocol-samples/pdu.011.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.011.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.012.xml b/rpkid/tests/left-right-protocol-samples/pdu.012.xml
index 338fcac6..338fcac6 100644
--- a/rpkid/left-right-protocol-samples/pdu.012.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.012.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.013.xml b/rpkid/tests/left-right-protocol-samples/pdu.013.xml
index c8435346..c8435346 100644
--- a/rpkid/left-right-protocol-samples/pdu.013.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.013.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.014.xml b/rpkid/tests/left-right-protocol-samples/pdu.014.xml
index cbd6f74d..cbd6f74d 100644
--- a/rpkid/left-right-protocol-samples/pdu.014.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.014.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.015.xml b/rpkid/tests/left-right-protocol-samples/pdu.015.xml
index 3ab81e32..3ab81e32 100644
--- a/rpkid/left-right-protocol-samples/pdu.015.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.015.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.016.xml b/rpkid/tests/left-right-protocol-samples/pdu.016.xml
index 822419df..822419df 100644
--- a/rpkid/left-right-protocol-samples/pdu.016.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.016.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.017.xml b/rpkid/tests/left-right-protocol-samples/pdu.017.xml
index e2c04883..e2c04883 100644
--- a/rpkid/left-right-protocol-samples/pdu.017.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.017.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.018.xml b/rpkid/tests/left-right-protocol-samples/pdu.018.xml
index 822419df..822419df 100644
--- a/rpkid/left-right-protocol-samples/pdu.018.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.018.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.019.xml b/rpkid/tests/left-right-protocol-samples/pdu.019.xml
index e54e1708..e54e1708 100644
--- a/rpkid/left-right-protocol-samples/pdu.019.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.019.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.020.xml b/rpkid/tests/left-right-protocol-samples/pdu.020.xml
index 85b962e9..85b962e9 100644
--- a/rpkid/left-right-protocol-samples/pdu.020.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.020.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.021.xml b/rpkid/tests/left-right-protocol-samples/pdu.021.xml
index 2ec2b300..2ec2b300 100644
--- a/rpkid/left-right-protocol-samples/pdu.021.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.021.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.022.xml b/rpkid/tests/left-right-protocol-samples/pdu.022.xml
index fcea46d1..fcea46d1 100644
--- a/rpkid/left-right-protocol-samples/pdu.022.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.022.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.023.xml b/rpkid/tests/left-right-protocol-samples/pdu.023.xml
index 0850a6af..0850a6af 100644
--- a/rpkid/left-right-protocol-samples/pdu.023.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.023.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.024.xml b/rpkid/tests/left-right-protocol-samples/pdu.024.xml
index 536d621a..536d621a 100644
--- a/rpkid/left-right-protocol-samples/pdu.024.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.024.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.025.xml b/rpkid/tests/left-right-protocol-samples/pdu.025.xml
index daa7e3b1..daa7e3b1 100644
--- a/rpkid/left-right-protocol-samples/pdu.025.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.025.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.026.xml b/rpkid/tests/left-right-protocol-samples/pdu.026.xml
index 1e6425ff..1e6425ff 100644
--- a/rpkid/left-right-protocol-samples/pdu.026.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.026.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.027.xml b/rpkid/tests/left-right-protocol-samples/pdu.027.xml
index dd3e7a28..dd3e7a28 100644
--- a/rpkid/left-right-protocol-samples/pdu.027.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.027.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.028.xml b/rpkid/tests/left-right-protocol-samples/pdu.028.xml
index 0a0e2e45..0a0e2e45 100644
--- a/rpkid/left-right-protocol-samples/pdu.028.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.028.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.029.xml b/rpkid/tests/left-right-protocol-samples/pdu.029.xml
index d24a3439..d24a3439 100644
--- a/rpkid/left-right-protocol-samples/pdu.029.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.029.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.030.xml b/rpkid/tests/left-right-protocol-samples/pdu.030.xml
index 1325b768..1325b768 100644
--- a/rpkid/left-right-protocol-samples/pdu.030.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.030.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.031.xml b/rpkid/tests/left-right-protocol-samples/pdu.031.xml
index 385b6fab..385b6fab 100644
--- a/rpkid/left-right-protocol-samples/pdu.031.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.031.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.032.xml b/rpkid/tests/left-right-protocol-samples/pdu.032.xml
index 888ecf70..888ecf70 100644
--- a/rpkid/left-right-protocol-samples/pdu.032.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.032.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.033.xml b/rpkid/tests/left-right-protocol-samples/pdu.033.xml
index 945f4bfe..945f4bfe 100644
--- a/rpkid/left-right-protocol-samples/pdu.033.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.033.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.034.xml b/rpkid/tests/left-right-protocol-samples/pdu.034.xml
index aa7875a9..aa7875a9 100644
--- a/rpkid/left-right-protocol-samples/pdu.034.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.034.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.035.xml b/rpkid/tests/left-right-protocol-samples/pdu.035.xml
index f433b239..f433b239 100644
--- a/rpkid/left-right-protocol-samples/pdu.035.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.035.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.036.xml b/rpkid/tests/left-right-protocol-samples/pdu.036.xml
index 2c4b9664..2c4b9664 100644
--- a/rpkid/left-right-protocol-samples/pdu.036.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.036.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.037.xml b/rpkid/tests/left-right-protocol-samples/pdu.037.xml
index 4c0f81ae..4c0f81ae 100644
--- a/rpkid/left-right-protocol-samples/pdu.037.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.037.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.038.xml b/rpkid/tests/left-right-protocol-samples/pdu.038.xml
index 34d0f6c8..34d0f6c8 100644
--- a/rpkid/left-right-protocol-samples/pdu.038.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.038.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.039.xml b/rpkid/tests/left-right-protocol-samples/pdu.039.xml
index d0f2b8a9..d0f2b8a9 100644
--- a/rpkid/left-right-protocol-samples/pdu.039.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.039.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.040.xml b/rpkid/tests/left-right-protocol-samples/pdu.040.xml
index c7f05451..c7f05451 100644
--- a/rpkid/left-right-protocol-samples/pdu.040.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.040.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.041.xml b/rpkid/tests/left-right-protocol-samples/pdu.041.xml
index e285cd9e..e285cd9e 100644
--- a/rpkid/left-right-protocol-samples/pdu.041.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.041.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.042.xml b/rpkid/tests/left-right-protocol-samples/pdu.042.xml
index 1b4e267b..1b4e267b 100644
--- a/rpkid/left-right-protocol-samples/pdu.042.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.042.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.043.xml b/rpkid/tests/left-right-protocol-samples/pdu.043.xml
index 437f9eff..437f9eff 100644
--- a/rpkid/left-right-protocol-samples/pdu.043.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.043.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.044.xml b/rpkid/tests/left-right-protocol-samples/pdu.044.xml
index 5e9dba3d..5e9dba3d 100644
--- a/rpkid/left-right-protocol-samples/pdu.044.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.044.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.045.xml b/rpkid/tests/left-right-protocol-samples/pdu.045.xml
index 51b8c983..51b8c983 100644
--- a/rpkid/left-right-protocol-samples/pdu.045.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.045.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.046.xml b/rpkid/tests/left-right-protocol-samples/pdu.046.xml
index 231d5cfb..231d5cfb 100644
--- a/rpkid/left-right-protocol-samples/pdu.046.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.046.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.047.xml b/rpkid/tests/left-right-protocol-samples/pdu.047.xml
index 8af3001f..8af3001f 100644
--- a/rpkid/left-right-protocol-samples/pdu.047.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.047.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.048.xml b/rpkid/tests/left-right-protocol-samples/pdu.048.xml
index 4e256f84..4e256f84 100644
--- a/rpkid/left-right-protocol-samples/pdu.048.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.048.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.049.xml b/rpkid/tests/left-right-protocol-samples/pdu.049.xml
index 4cf226b6..4cf226b6 100644
--- a/rpkid/left-right-protocol-samples/pdu.049.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.049.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.050.xml b/rpkid/tests/left-right-protocol-samples/pdu.050.xml
index b2d6a2cb..b2d6a2cb 100644
--- a/rpkid/left-right-protocol-samples/pdu.050.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.050.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.051.xml b/rpkid/tests/left-right-protocol-samples/pdu.051.xml
index 70bd52e4..70bd52e4 100644
--- a/rpkid/left-right-protocol-samples/pdu.051.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.051.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.052.xml b/rpkid/tests/left-right-protocol-samples/pdu.052.xml
index 3cefe413..3cefe413 100644
--- a/rpkid/left-right-protocol-samples/pdu.052.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.052.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.053.xml b/rpkid/tests/left-right-protocol-samples/pdu.053.xml
index dc850831..dc850831 100644
--- a/rpkid/left-right-protocol-samples/pdu.053.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.053.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.054.xml b/rpkid/tests/left-right-protocol-samples/pdu.054.xml
index 621ad9e6..621ad9e6 100644
--- a/rpkid/left-right-protocol-samples/pdu.054.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.054.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.055.xml b/rpkid/tests/left-right-protocol-samples/pdu.055.xml
index bc6d2430..bc6d2430 100644
--- a/rpkid/left-right-protocol-samples/pdu.055.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.055.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.056.xml b/rpkid/tests/left-right-protocol-samples/pdu.056.xml
index 7d9da614..7d9da614 100644
--- a/rpkid/left-right-protocol-samples/pdu.056.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.056.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.057.xml b/rpkid/tests/left-right-protocol-samples/pdu.057.xml
index 4ba66068..4ba66068 100644
--- a/rpkid/left-right-protocol-samples/pdu.057.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.057.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.058.xml b/rpkid/tests/left-right-protocol-samples/pdu.058.xml
index 80261f4b..80261f4b 100644
--- a/rpkid/left-right-protocol-samples/pdu.058.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.058.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.059.xml b/rpkid/tests/left-right-protocol-samples/pdu.059.xml
index b6cb58e4..b6cb58e4 100644
--- a/rpkid/left-right-protocol-samples/pdu.059.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.059.xml
diff --git a/rpkid/left-right-protocol-samples/pdu.060.xml b/rpkid/tests/left-right-protocol-samples/pdu.060.xml
index 9778fd94..9778fd94 100644
--- a/rpkid/left-right-protocol-samples/pdu.060.xml
+++ b/rpkid/tests/left-right-protocol-samples/pdu.060.xml
diff --git a/rpkid/publication-protocol-samples.xml b/rpkid/tests/publication-protocol-samples.xml
index 12df2785..12df2785 100644
--- a/rpkid/publication-protocol-samples.xml
+++ b/rpkid/tests/publication-protocol-samples.xml
diff --git a/rpkid/publication-protocol-samples/.stamp b/rpkid/tests/publication-protocol-samples/.stamp
index e69de29b..e69de29b 100644
--- a/rpkid/publication-protocol-samples/.stamp
+++ b/rpkid/tests/publication-protocol-samples/.stamp
diff --git a/rpkid/publication-protocol-samples/pdu.001.xml b/rpkid/tests/publication-protocol-samples/pdu.001.xml
index 99b676d9..99b676d9 100644
--- a/rpkid/publication-protocol-samples/pdu.001.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.001.xml
diff --git a/rpkid/publication-protocol-samples/pdu.002.xml b/rpkid/tests/publication-protocol-samples/pdu.002.xml
index 33b53084..33b53084 100644
--- a/rpkid/publication-protocol-samples/pdu.002.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.002.xml
diff --git a/rpkid/publication-protocol-samples/pdu.003.xml b/rpkid/tests/publication-protocol-samples/pdu.003.xml
index c9325602..c9325602 100644
--- a/rpkid/publication-protocol-samples/pdu.003.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.003.xml
diff --git a/rpkid/publication-protocol-samples/pdu.004.xml b/rpkid/tests/publication-protocol-samples/pdu.004.xml
index 745ef003..745ef003 100644
--- a/rpkid/publication-protocol-samples/pdu.004.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.004.xml
diff --git a/rpkid/publication-protocol-samples/pdu.005.xml b/rpkid/tests/publication-protocol-samples/pdu.005.xml
index e8dd0180..e8dd0180 100644
--- a/rpkid/publication-protocol-samples/pdu.005.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.005.xml
diff --git a/rpkid/publication-protocol-samples/pdu.006.xml b/rpkid/tests/publication-protocol-samples/pdu.006.xml
index 4b5d12cf..4b5d12cf 100644
--- a/rpkid/publication-protocol-samples/pdu.006.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.006.xml
diff --git a/rpkid/publication-protocol-samples/pdu.007.xml b/rpkid/tests/publication-protocol-samples/pdu.007.xml
index 5e4a400f..5e4a400f 100644
--- a/rpkid/publication-protocol-samples/pdu.007.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.007.xml
diff --git a/rpkid/publication-protocol-samples/pdu.008.xml b/rpkid/tests/publication-protocol-samples/pdu.008.xml
index cba4be83..cba4be83 100644
--- a/rpkid/publication-protocol-samples/pdu.008.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.008.xml
diff --git a/rpkid/publication-protocol-samples/pdu.009.xml b/rpkid/tests/publication-protocol-samples/pdu.009.xml
index 903e5438..903e5438 100644
--- a/rpkid/publication-protocol-samples/pdu.009.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.009.xml
diff --git a/rpkid/publication-protocol-samples/pdu.010.xml b/rpkid/tests/publication-protocol-samples/pdu.010.xml
index b93a5e78..b93a5e78 100644
--- a/rpkid/publication-protocol-samples/pdu.010.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.010.xml
diff --git a/rpkid/publication-protocol-samples/pdu.011.xml b/rpkid/tests/publication-protocol-samples/pdu.011.xml
index b930d604..b930d604 100644
--- a/rpkid/publication-protocol-samples/pdu.011.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.011.xml
diff --git a/rpkid/publication-protocol-samples/pdu.012.xml b/rpkid/tests/publication-protocol-samples/pdu.012.xml
index f77709f3..f77709f3 100644
--- a/rpkid/publication-protocol-samples/pdu.012.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.012.xml
diff --git a/rpkid/publication-protocol-samples/pdu.013.xml b/rpkid/tests/publication-protocol-samples/pdu.013.xml
index 67313d0d..67313d0d 100644
--- a/rpkid/publication-protocol-samples/pdu.013.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.013.xml
diff --git a/rpkid/publication-protocol-samples/pdu.014.xml b/rpkid/tests/publication-protocol-samples/pdu.014.xml
index 95dcd88a..95dcd88a 100644
--- a/rpkid/publication-protocol-samples/pdu.014.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.014.xml
diff --git a/rpkid/publication-protocol-samples/pdu.015.xml b/rpkid/tests/publication-protocol-samples/pdu.015.xml
index 2ba77edf..2ba77edf 100644
--- a/rpkid/publication-protocol-samples/pdu.015.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.015.xml
diff --git a/rpkid/publication-protocol-samples/pdu.016.xml b/rpkid/tests/publication-protocol-samples/pdu.016.xml
index c548bceb..c548bceb 100644
--- a/rpkid/publication-protocol-samples/pdu.016.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.016.xml
diff --git a/rpkid/publication-protocol-samples/pdu.017.xml b/rpkid/tests/publication-protocol-samples/pdu.017.xml
index cd6001f5..cd6001f5 100644
--- a/rpkid/publication-protocol-samples/pdu.017.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.017.xml
diff --git a/rpkid/publication-protocol-samples/pdu.018.xml b/rpkid/tests/publication-protocol-samples/pdu.018.xml
index 4e5d606a..4e5d606a 100644
--- a/rpkid/publication-protocol-samples/pdu.018.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.018.xml
diff --git a/rpkid/publication-protocol-samples/pdu.019.xml b/rpkid/tests/publication-protocol-samples/pdu.019.xml
index e404c3b9..e404c3b9 100644
--- a/rpkid/publication-protocol-samples/pdu.019.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.019.xml
diff --git a/rpkid/publication-protocol-samples/pdu.020.xml b/rpkid/tests/publication-protocol-samples/pdu.020.xml
index b94b45a4..b94b45a4 100644
--- a/rpkid/publication-protocol-samples/pdu.020.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.020.xml
diff --git a/rpkid/publication-protocol-samples/pdu.021.xml b/rpkid/tests/publication-protocol-samples/pdu.021.xml
index f54f18e4..f54f18e4 100644
--- a/rpkid/publication-protocol-samples/pdu.021.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.021.xml
diff --git a/rpkid/publication-protocol-samples/pdu.022.xml b/rpkid/tests/publication-protocol-samples/pdu.022.xml
index 20c30004..20c30004 100644
--- a/rpkid/publication-protocol-samples/pdu.022.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.022.xml
diff --git a/rpkid/publication-protocol-samples/pdu.023.xml b/rpkid/tests/publication-protocol-samples/pdu.023.xml
index 34606b8d..34606b8d 100644
--- a/rpkid/publication-protocol-samples/pdu.023.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.023.xml
diff --git a/rpkid/publication-protocol-samples/pdu.024.xml b/rpkid/tests/publication-protocol-samples/pdu.024.xml
index 8fb07898..8fb07898 100644
--- a/rpkid/publication-protocol-samples/pdu.024.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.024.xml
diff --git a/rpkid/publication-protocol-samples/pdu.025.xml b/rpkid/tests/publication-protocol-samples/pdu.025.xml
index 22639575..22639575 100644
--- a/rpkid/publication-protocol-samples/pdu.025.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.025.xml
diff --git a/rpkid/publication-protocol-samples/pdu.026.xml b/rpkid/tests/publication-protocol-samples/pdu.026.xml
index 951dde35..951dde35 100644
--- a/rpkid/publication-protocol-samples/pdu.026.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.026.xml
diff --git a/rpkid/publication-protocol-samples/pdu.027.xml b/rpkid/tests/publication-protocol-samples/pdu.027.xml
index 0a4608b4..0a4608b4 100644
--- a/rpkid/publication-protocol-samples/pdu.027.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.027.xml
diff --git a/rpkid/publication-protocol-samples/pdu.028.xml b/rpkid/tests/publication-protocol-samples/pdu.028.xml
index 8f4c22dc..8f4c22dc 100644
--- a/rpkid/publication-protocol-samples/pdu.028.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.028.xml
diff --git a/rpkid/publication-protocol-samples/pdu.029.xml b/rpkid/tests/publication-protocol-samples/pdu.029.xml
index 6319d0be..6319d0be 100644
--- a/rpkid/publication-protocol-samples/pdu.029.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.029.xml
diff --git a/rpkid/publication-protocol-samples/pdu.030.xml b/rpkid/tests/publication-protocol-samples/pdu.030.xml
index a0dc50a9..a0dc50a9 100644
--- a/rpkid/publication-protocol-samples/pdu.030.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.030.xml
diff --git a/rpkid/publication-protocol-samples/pdu.031.xml b/rpkid/tests/publication-protocol-samples/pdu.031.xml
index 544c817e..544c817e 100644
--- a/rpkid/publication-protocol-samples/pdu.031.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.031.xml
diff --git a/rpkid/publication-protocol-samples/pdu.032.xml b/rpkid/tests/publication-protocol-samples/pdu.032.xml
index 3e9f8c77..3e9f8c77 100644
--- a/rpkid/publication-protocol-samples/pdu.032.xml
+++ b/rpkid/tests/publication-protocol-samples/pdu.032.xml
diff --git a/rpkid/tests/rpki b/rpkid/tests/rpki
new file mode 120000
index 00000000..8d289d0b
--- /dev/null
+++ b/rpkid/tests/rpki
@@ -0,0 +1 @@
+../rpki
\ No newline at end of file
diff --git a/rpkid/split-protocol-samples.xsl b/rpkid/tests/split-protocol-samples.xsl
index 8800b6da..8800b6da 100644
--- a/rpkid/split-protocol-samples.xsl
+++ b/rpkid/tests/split-protocol-samples.xsl
diff --git a/rpkid/testbed.1.yaml b/rpkid/tests/testbed.1.yaml
index ed889636..fcce6437 100644
--- a/rpkid/testbed.1.yaml
+++ b/rpkid/tests/testbed.1.yaml
@@ -48,7 +48,7 @@ kids:
       - asn: 666
         ipv4: 10.3.0.44/32
 ---
-- shell set -x; cd ../../rtr-origin && python rtr-origin.py --cronjob ../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
+- shell set -x; cd ../../../rtr-origin && python rtr-origin.py --cronjob ../../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
 ---
 - name: R0
   rekey:
@@ -63,7 +63,7 @@ kids:
     - asn: 17
       ipv4: 10.3.0.1/32, 10.0.0.44/32
 ---
-- shell set -x; cd ../../rtr-origin && python rtr-origin.py --cronjob ../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
+- shell set -x; cd ../../../rtr-origin && python rtr-origin.py --cronjob ../../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
 ---
 - sleep 30
 ---
diff --git a/rpkid/testbed.2.yaml b/rpkid/tests/testbed.2.yaml
index 0cdec650..0cdec650 100644
--- a/rpkid/testbed.2.yaml
+++ b/rpkid/tests/testbed.2.yaml
diff --git a/rpkid/testbed.3.yaml b/rpkid/tests/testbed.3.yaml
index d842c751..29eeb180 100644
--- a/rpkid/testbed.3.yaml
+++ b/rpkid/tests/testbed.3.yaml
@@ -50,10 +50,10 @@ kids:
       - asn: 666
         ipv4: 10.3.0.0/23
 ---
-#- shell find publication -type f -name '*.roa' -print -exec ../../utils/print_roa/print_roa {} \;
-#- shell find publication -type f -name '*.mnf' -print -exec ../../utils/print_manifest/print_manifest {} \;
+#- shell find publication -type f -name '*.roa' -print -exec ../../../utils/print_roa/print_roa {} \;
+#- shell find publication -type f -name '*.mnf' -print -exec ../../../utils/print_manifest/print_manifest {} \;
 #---
-#- shell find publication -type f -name '*.roa' -print -exec ../../utils/print_roa/print_roa {} \;
-#- shell find publication -type f -name '*.mnf' -print -exec ../../utils/print_manifest/print_manifest {} \;
+#- shell find publication -type f -name '*.roa' -print -exec ../../../utils/print_roa/print_roa {} \;
+#- shell find publication -type f -name '*.mnf' -print -exec ../../../utils/print_manifest/print_manifest {} \;
 #---
-- shell set -x; cd ../../rtr-origin && python rtr-origin.py --cronjob ../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
+- shell set -x; cd ../../../rtr-origin && python rtr-origin.py --cronjob ../../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
diff --git a/rpkid/testbed.4.yaml b/rpkid/tests/testbed.4.yaml
index ee447daa..ee447daa 100644
--- a/rpkid/testbed.4.yaml
+++ b/rpkid/tests/testbed.4.yaml
diff --git a/rpkid/testbed.5.yaml b/rpkid/tests/testbed.5.yaml
index c6304dfc..c6304dfc 100644
--- a/rpkid/testbed.5.yaml
+++ b/rpkid/tests/testbed.5.yaml
diff --git a/rpkid/testbed.6.yaml b/rpkid/tests/testbed.6.yaml
index dbcc06e3..dbcc06e3 100644
--- a/rpkid/testbed.6.yaml
+++ b/rpkid/tests/testbed.6.yaml
diff --git a/rpkid/testbed.7.yaml b/rpkid/tests/testbed.7.yaml
index 50b90adc..739aa27d 100644
--- a/rpkid/testbed.7.yaml
+++ b/rpkid/tests/testbed.7.yaml
@@ -68,5 +68,5 @@ roa_request:
     ipv4: 208.91.236.0/22,203.33.196.0/24,203.27.251.0/24,198.80.148.0/24,198.80.131.0/24,157.130.103.144/30,140.222.224.0/24,65.243.171.0/24,63.122.162.212/30,63.116.191.0/24,63.81.136.0/24,17.0.0.0/8,17.128.0.0/9
 
 ---
-- shell set -x; find publication -type f -name '*.roa' -print -exec ../../utils/print_roa/print_roa {} \;
-- shell set -x; cd ../../rtr-origin && python rtr-origin.py --cronjob ../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
+- shell set -x; find publication -type f -name '*.roa' -print -exec ../../../utils/print_roa/print_roa {} \;
+- shell set -x; cd ../../../rtr-origin && python rtr-origin.py --cronjob ../../rpkid/testbed.dir/rcynic-data/authenticated && python rtr-origin.py --show
diff --git a/rpkid/testbed.clean.sql b/rpkid/tests/testbed.clean.sql
index 583824ef..583824ef 100644
--- a/rpkid/testbed.clean.sql
+++ b/rpkid/tests/testbed.clean.sql
diff --git a/rpkid/testbed.py b/rpkid/tests/testbed.py
index 28e40d25..2f479050 100644
--- a/rpkid/testbed.py
+++ b/rpkid/tests/testbed.py
@@ -134,20 +134,20 @@ rcynic_name    = cfg.get("rcynic_name",    "rcynic")
 pubd_name      = cfg.get("pubd_name",      "pubd")
 
 prog_python    = cfg.get("prog_python",    "python")
-prog_rpkid     = cfg.get("prog_rpkid",     "../rpkid.py")
-prog_irdbd     = cfg.get("prog_irdbd",     "../irdbd.py")
-prog_poke      = cfg.get("prog_poke",      "../testpoke.py")
-prog_rootd     = cfg.get("prog_rootd",     "../rootd.py")
-prog_pubd      = cfg.get("prog_pubd",      "../pubd.py")
-prog_openssl   = cfg.get("prog_openssl",   "../../openssl/openssl/apps/openssl")
+prog_rpkid     = cfg.get("prog_rpkid",     "../../rpkid.py")
+prog_irdbd     = cfg.get("prog_irdbd",     "../../irdbd.py")
+prog_poke      = cfg.get("prog_poke",      "../../testpoke.py")
+prog_rootd     = cfg.get("prog_rootd",     "../../rootd.py")
+prog_pubd      = cfg.get("prog_pubd",      "../../pubd.py")
+prog_openssl   = cfg.get("prog_openssl",   "../../../openssl/openssl/apps/openssl")
 prog_rsyncd    = cfg.get("prog_rsyncd",    "rsync")
-prog_rcynic    = cfg.get("prog_rcynic",    "../../rcynic/rcynic")
+prog_rcynic    = cfg.get("prog_rcynic",    "../../../rcynic/rcynic")
 
-rcynic_stats   = cfg.get("rcynic_stats",   "echo ; ../../rcynic/show.sh %s.xml ; echo" % rcynic_name)
+rcynic_stats   = cfg.get("rcynic_stats",   "echo ; ../../../rcynic/show.sh %s.xml ; echo" % rcynic_name)
 
-rpki_sql_file  = cfg.get("rpki_sql_file",  "rpkid.sql")
-irdb_sql_file  = cfg.get("irdb_sql_file",  "irdbd.sql")
-pub_sql_file   = cfg.get("pub_sql_file",   "pubd.sql")
+rpki_sql_file  = cfg.get("rpki_sql_file",  "../rpkid.sql")
+irdb_sql_file  = cfg.get("irdb_sql_file",  "../irdbd.sql")
+pub_sql_file   = cfg.get("pub_sql_file",   "../pubd.sql")
 
 startup_delay  = int(cfg.get("startup_delay", "10"))
 
diff --git a/rpkid/testbed.setup.sql b/rpkid/tests/testbed.setup.sql
index 72d02fe2..72d02fe2 100644
--- a/rpkid/testbed.setup.sql
+++ b/rpkid/tests/testbed.setup.sql
diff --git a/rpkid/up-down-protocol-samples/Makefile b/rpkid/tests/up-down-protocol-samples/Makefile
index 10ee791a..10ee791a 100644
--- a/rpkid/up-down-protocol-samples/Makefile
+++ b/rpkid/tests/up-down-protocol-samples/Makefile
diff --git a/rpkid/up-down-protocol-samples/error_response.xml b/rpkid/tests/up-down-protocol-samples/error_response.xml
index 83af6649..83af6649 100644
--- a/rpkid/up-down-protocol-samples/error_response.xml
+++ b/rpkid/tests/up-down-protocol-samples/error_response.xml
diff --git a/rpkid/up-down-protocol-samples/issue1.xml b/rpkid/tests/up-down-protocol-samples/issue1.xml
index 4b8366f9..4b8366f9 100644
--- a/rpkid/up-down-protocol-samples/issue1.xml
+++ b/rpkid/tests/up-down-protocol-samples/issue1.xml
diff --git a/rpkid/up-down-protocol-samples/issue2.xml b/rpkid/tests/up-down-protocol-samples/issue2.xml
index a991cbcd..a991cbcd 100644
--- a/rpkid/up-down-protocol-samples/issue2.xml
+++ b/rpkid/tests/up-down-protocol-samples/issue2.xml
diff --git a/rpkid/up-down-protocol-samples/issue_response.xml b/rpkid/tests/up-down-protocol-samples/issue_response.xml
index 39f6b954..39f6b954 100644
--- a/rpkid/up-down-protocol-samples/issue_response.xml
+++ b/rpkid/tests/up-down-protocol-samples/issue_response.xml
diff --git a/rpkid/up-down-protocol-samples/list.xml b/rpkid/tests/up-down-protocol-samples/list.xml
index 01a803f3..01a803f3 100644
--- a/rpkid/up-down-protocol-samples/list.xml
+++ b/rpkid/tests/up-down-protocol-samples/list.xml
diff --git a/rpkid/up-down-protocol-samples/list_response.xml b/rpkid/tests/up-down-protocol-samples/list_response.xml
index 9e368f5a..9e368f5a 100644
--- a/rpkid/up-down-protocol-samples/list_response.xml
+++ b/rpkid/tests/up-down-protocol-samples/list_response.xml
diff --git a/rpkid/up-down-protocol-samples/revoke.xml b/rpkid/tests/up-down-protocol-samples/revoke.xml
index eb4b3efb..eb4b3efb 100644
--- a/rpkid/up-down-protocol-samples/revoke.xml
+++ b/rpkid/tests/up-down-protocol-samples/revoke.xml
diff --git a/rpkid/up-down-protocol-samples/revoke_response.xml b/rpkid/tests/up-down-protocol-samples/revoke_response.xml
index 9f4ebacc..9f4ebacc 100644
--- a/rpkid/up-down-protocol-samples/revoke_response.xml
+++ b/rpkid/tests/up-down-protocol-samples/revoke_response.xml
diff --git a/rpkid/xml-parse-test.py b/rpkid/tests/xml-parse-test.py
index 48154a79..48154a79 100644
--- a/rpkid/xml-parse-test.py
+++ b/rpkid/tests/xml-parse-test.py