header #1 in module #4;document in module #3;article in module #3;title #1 in module #2;article in module #1;title #2 in module #2;
+header #1 in module #4;document in module #3;article in module #3;title #1 in module #2;article in module #1;title #2 in module #2;
diff --git a/tests/general/bug-147.out b/tests/general/bug-147.out
index 46963a8c..024a4dce 100644
--- a/tests/general/bug-147.out
+++ b/tests/general/bug-147.out
@@ -1,5 +1,5 @@
-template#1 in module#1;
template#3 in module#3;
template#5 in module#3;abc
diff --git a/tests/general/bug-159.out b/tests/general/bug-159.out
index 7187f99d..a6ba7660 100644
--- a/tests/general/bug-159.out
+++ b/tests/general/bug-159.out
@@ -1,5 +1,5 @@
-
+
ёa lot of text
ё
diff --git a/tests/general/bug-165.err b/tests/general/bug-165.err
index df0e7949..69801486 100644
--- a/tests/general/bug-165.err
+++ b/tests/general/bug-165.err
@@ -1,6 +1,6 @@
runtime error: file ./bug-165.xsl line 6 element value-of
Variable 'pStyle' has not been declared.
-XPath error : Undefined variable
+XPath error : Undefined variable: pStyle
runtime error: file ./bug-165.xsl line 6 element value-of
XPath evaluation returned no result.
no result for ./bug-165.xml
diff --git a/tests/general/bug-175.out b/tests/general/bug-175.out
index e9cf403b..27a5746e 100644
--- a/tests/general/bug-175.out
+++ b/tests/general/bug-175.out
@@ -1,7 +1,7 @@
-
+
xsl:function
xsl:function not supported, but properly handled (ignored)
diff --git a/tests/general/bug-180.err b/tests/general/bug-180.err
index 76e3ae1d..3512b1d9 100644
--- a/tests/general/bug-180.err
+++ b/tests/general/bug-180.err
@@ -1,4 +1,4 @@
runtime error: file ./bug-180.xsl line 4 element copy-of
Variable 'xxx' has not been declared.
-XPath error : Undefined variable
+XPath error : Undefined variable: xxx
no result for ./bug-180.xml
diff --git a/tests/general/bug-184.err b/tests/general/bug-184.err
index ddcef71d..ccca08a2 100644
--- a/tests/general/bug-184.err
+++ b/tests/general/bug-184.err
@@ -1,6 +1,6 @@
runtime error: file ./bug-184.xsl line 5 element value-of
Variable 'nonexistent' has not been declared.
-XPath error : Undefined variable
+XPath error : Undefined variable: nonexistent
runtime error: file ./bug-184.xsl line 5 element value-of
XPath evaluation returned no result.
no result for ./bug-184.xml
diff --git a/tests/general/bug-194.err b/tests/general/bug-194.err
index 79b9b009..03ed54df 100644
--- a/tests/general/bug-194.err
+++ b/tests/general/bug-194.err
@@ -1,9 +1,9 @@
runtime error
Variable 'p' has not been declared.
-XPath error : Undefined variable
+XPath error : Undefined variable: p
runtime error: file ./bug-194.xsl line 4 element param
Failed to evaluate the expression of variable 'p'.
-XPath error : Undefined variable
+XPath error : Undefined variable: p
runtime error: file ./bug-194.xsl line 5 element param
Failed to evaluate the expression of variable 'p2'.
no result for ./bug-194.xml
diff --git a/tests/general/bug-208.err b/tests/general/bug-208.err
index 4b96fa74..3c90cd83 100644
--- a/tests/general/bug-208.err
+++ b/tests/general/bug-208.err
@@ -1,6 +1,6 @@
-XPath error : Undefined namespace prefix
-XPath error : Undefined namespace prefix
-XPath error : Undefined namespace prefix
-XPath error : Undefined namespace prefix
-XPath error : Undefined namespace prefix
+XPath error : Undefined namespace prefix: a
+XPath error : Undefined namespace prefix: a
+XPath error : Undefined namespace prefix: a
+XPath error : Undefined namespace prefix: a
+XPath error : Undefined namespace prefix: a
no result for ./bug-208.xml
diff --git a/tests/general/bug-33-.out b/tests/general/bug-33-.out
index 4aa9e549..4d3d4f11 100644
--- a/tests/general/bug-33-.out
+++ b/tests/general/bug-33-.out
@@ -1,6 +1,6 @@
-
+
Midterm Exam