diff --git a/include/XSLT/impl/xslt_compilation_context.hpp b/include/XSLT/impl/xslt_compilation_context.hpp
index dfffe841..669f344b 100755
--- a/include/XSLT/impl/xslt_compilation_context.hpp
+++ b/include/XSLT/impl/xslt_compilation_context.hpp
@@ -158,6 +158,8 @@ private:
     if((name == "current") && (current_allowed_))
       return new CurrentFunction(argExprs);
     // unparsed-entity-uri
+    if(name == "unparsed-entity-uri")
+      return new UnparsedEntityUriFunction(argExprs);
     // generate-id
     if(name == "generate-id")
       return new GenerateIdFunction(argExprs);
diff --git a/include/XSLT/impl/xslt_functions.hpp b/include/XSLT/impl/xslt_functions.hpp
index c8e09b0f..6d8116f4 100644
--- a/include/XSLT/impl/xslt_functions.hpp
+++ b/include/XSLT/impl/xslt_functions.hpp
@@ -83,6 +83,24 @@ public:
 }; // CurrentFunction
 
 // string unparsed-entity-uri(string)
+class UnparsedEntityUriFunction : public Arabica::XPath::XPathFunction<std::string>
+{
+  typedef Arabica::XPath::XPathFunction<std::string> baseT;
+
+public:
+  UnparsedEntityUriFunction(const std::vector<Arabica::XPath::XPathExpression<std::string> >& args) :
+    Arabica::XPath::XPathFunction<std::string>(1, 1, args) { }
+
+  virtual Arabica::XPath::ValueType type() const { return Arabica::XPath::STRING; }
+
+  virtual Arabica::XPath::XPathValue_impl<std::string>* evaluate(const DOM::Node<std::string>& context, 
+                                            const Arabica::XPath::ExecutionContext<std::string>& executionContext) const
+  {
+    // This is a minimal, but I think conformant, implementation
+    return new Arabica::XPath::StringValue<std::string>("");
+  } // evaluate
+}; // UnparsedEntityUri
+
 // string generate-id(node-set?)
 class GenerateIdFunction : public Arabica::XPath::XPathFunction<std::string>
 {
diff --git a/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml b/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
index a7be8d7b..e5098a95 100644
--- a/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
+++ b/tests/XSLT/testsuite/TESTS/arabica-expected-fails.xml
@@ -215,7 +215,7 @@
   <test-case id="Attributes__89466" compare="fragment"/>
   <test-case id="Attributes_Attribute_WhitespaceInUseAttributeSets" compiles="no" reason="Haven't implemented attribute-sets"/>
   <test-case id="Attributes_EmptyStringInUseAttribSets" compiles="no" reason="Haven't implemented attribute-sets"/>
-  <test-case id="BVTs_bvt001" compiles="no" reason="Doesn't understand xml:space properly"/>
+	<test-case id="BVTs_bvt001" compare="fragment"/>
   <test-case id="BVTs_bvt002" compiles="no" reason="Haven't implemented embedded stylesheets yet"/>
   <test-case id="BVTs_bvt003" compiles="no" reason="Needs attribute sets"/>
   <test-case id="BVTs_bvt004" compiles="no" reason="Haven't implemented embedded stylesheets yet"/>
@@ -252,7 +252,9 @@
   <test-case id="BVTs_bvt060" compiles="no" reason="Needs xsl:number"/>
   <test-case id="BVTs_bvt061" compiles="no" reason="Needs xsl:number"/>
   <test-case id="BVTs_bvt062" compare="fragment"/>
+	<test-case id="BVTs_bvt064" skip="yes" reason="HTML output"/>
   <test-case id="BVTs_bvt065" compare="fragment"/>
+  <test-case id="BVTs_bvt069" compare="text"/>	
   <test-case id="BVTs_bvt070" compare="text"/>
   <test-case id="BVTs_bvt072" compare="fragment"/>
   <test-case id="BVTs_bvt073" compare="fragment"/>
@@ -262,10 +264,10 @@
   <test-case id="BVTs_bvt079" compare="fragment"/>
   <test-case id="BVTs_bvt080" compare="fragment"/>
   <test-case id="BVTs_bvt081" compiles="no" reason="Haven't implemented embedded stylesheets yet"/>
-  <test-case id="BVTs_bvt083" compiles="no"/>
+  <test-case id="BVTs_bvt083" compare="fragment"/>
   <test-case id="BVTs_bvt085" skip="yes" reason="Bad result data"/>
-  <test-case id="BVTs_bvt086" compiles="no"/>
-  <test-case id="BVTs_bvt089" compiles="no" reason="Haven't implemented unparsed-entity-uri"/>
+  <test-case id="BVTs_bvt086" compare="fragment"/>
+  <test-case id="BVTs_bvt089" compare="fragment"/>
   <test-case id="BVTs_bvt090" compare="fragment"/>
   <test-case id="BVTs_bvt092" compare="fragment"/>
   <test-case id="BVTs_bvt094" compare="text"/>
@@ -750,7 +752,6 @@
   <test-case id="XSLTFunctions_DocumentInUnionWithDuplicateNodes" runs="no"/>
   <test-case id="XSLTFunctions_ElementAvailFunctionFalseTest" compiles="no"/>
   <test-case id="XSLTFunctions_ElementAvailFunctionTrueTest" compiles="no"/>
-  <test-case id="XSLTFunctions_GenereateIdAppliedToNamespaceNodesOnDifferentElements" compiles="no"/>
   <test-case id="XSLTFunctions_KeyFuncTestDescendantsNodeset" compiles="no"/>
   <test-case id="XSLTFunctions_TestIdFuncInComplexStruct" compiles="no"/>
   <test-case id="XSLTFunctions_TestOfIdFunction" compiles="no"/>