Index: xword/ContentFiltering/ContentFiltering.csproj
===================================================================
--- xword/ContentFiltering/ContentFiltering.csproj	(revision 21435)
+++ xword/ContentFiltering/ContentFiltering.csproj	(working copy)
@@ -31,6 +31,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\dependencies\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="nunit.mocks, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\dependencies\nunit.mocks.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -68,6 +76,17 @@
     <Compile Include="Office\Word\Filters\StyleRemoverFilter.cs" />
     <Compile Include="Office\Word\WebToLocalHTML.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Test\Office\Word\Filters\GrammarAndSpellingErrorsFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\LocalImageAdaptorFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\LocalMacrosAdaptorFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\OfficeAttributesRemoverFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\StyleRemoverFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\WebImageAdaptorFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\WebListsAdaptorFilterTest.cs" />
+    <Compile Include="Test\Office\Word\Filters\WebMacrosAdaptorFilterTest.cs" />
+    <Compile Include="Test\Util\ConversionManagerUtil.cs" />
+    <Compile Include="Test\Util\XmlDocComparator.cs" />
+    <Compile Include="Test\Util\XWikiClientUtil.cs" />
     <Compile Include="Xml\XmlDocumentExtension.cs" />
   </ItemGroup>
   <ItemGroup>
Index: xword/ContentFiltering/Office/Word/Filters/GrammarAndSpellingErrorsFilter.cs
===================================================================
--- xword/ContentFiltering/Office/Word/Filters/GrammarAndSpellingErrorsFilter.cs	(revision 21435)
+++ xword/ContentFiltering/Office/Word/Filters/GrammarAndSpellingErrorsFilter.cs	(working copy)
@@ -9,6 +9,7 @@
     public class GrammarAndSpellingErrorsFilter:IDOMFilter
     {
         private ConversionManager manager;
+
         public GrammarAndSpellingErrorsFilter(ConversionManager manager)
         {
             this.manager = manager;
Index: xword/ContentFiltering/Office/Word/Filters/StyleRemoverFilter.cs
===================================================================
--- xword/ContentFiltering/Office/Word/Filters/StyleRemoverFilter.cs	(revision 21435)
+++ xword/ContentFiltering/Office/Word/Filters/StyleRemoverFilter.cs	(working copy)
@@ -35,7 +35,7 @@
             xIterator = navigator.Select(expression);
             foreach (XPathNavigator nav in xIterator)
             {
-                if (nav.Value == "MsoNormal" || nav.Value == "MsoNormalTable" || nav.Value == "MsoTableGrid")
+                if (nav.Value == "MsoNormal" || nav.Value == "MsoNormalTable" || nav.Value == "MsoTableGrid"||nav.Value=="MsoNoSpacing")
                 {
                     nav.DeleteSelf();
                 }
Index: xword/ContentFiltering/Office/Word/Filters/WebListsAdaptorFilter.cs
===================================================================
--- xword/ContentFiltering/Office/Word/Filters/WebListsAdaptorFilter.cs	(revision 21435)
+++ xword/ContentFiltering/Office/Word/Filters/WebListsAdaptorFilter.cs	(working copy)
@@ -20,7 +20,7 @@
 
         /// <summary>
         /// Adapts the HTML lists to lists known by MS Word, because Word doesn't like
-        /// 'ul' inside 'li' elements with innerText.
+        /// 'ul' and 'ol' inside 'li' elements with innerText.
         /// </summary>
         /// <param name="xmlDoc">A reference to an xml document.</param>
         public void Filter(ref XmlDocument xmlDoc)
@@ -28,7 +28,7 @@
             Dictionary<XmlNode, List<XmlNode>> itemsToMoveUp = new Dictionary<XmlNode, List<XmlNode>>();
             XmlNodeList listItems = xmlDoc.GetElementsByTagName("li");
 
-            //itentify <li> elements with <ul> children
+            //itentify <li> elements with <ul> or <ol> children
             foreach (XmlNode node in listItems)
             {
                 XmlNodeList children = node.ChildNodes;
Index: xword/ContentFiltering/Test/Office/Word/Filters/GrammarAndSpellingErrorsFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/GrammarAndSpellingErrorsFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/GrammarAndSpellingErrorsFilterTest.cs	(revision 0)
@@ -0,0 +1,84 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+
+    /// <summary>
+    /// Test class for <code>GrammarAndSpellingErrorsFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class GrammarAndSpellingErrorsFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string cleanedHTML;
+        private XmlDocument initialXmlDoc;
+        private XmlDocument cleanedXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public GrammarAndSpellingErrorsFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            cleanedHTML = "";
+            initialXmlDoc = new XmlDocument();
+            cleanedXmlDoc=new XmlDocument();
+        }
+
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            initialHTML = "<html>"
+                    + "<body>"
+                    + "<div>"
+                    + "<h1>Page title <span class=\"SpellE\">gos</span> here</h1>"
+                    + "<p>Page content goes here.</p>"
+                    + "<p><span class=\"GramE\">And</span> some <span class=\"SpellE\">errrors</span> goes here.</p>"
+                    + "<p>We <span class=\"SpellE\">shold</span> have both grammar and <span class=\"SpellE\">spelings</span><span class=\"SpellE\">erors</span>.</p>"
+                    + "<p>He <span class=\"GramE\">have</span> apples.</p>"
+                    + "<p><span lang=\"EN-US\">Un cuvant</span></p>"
+                    + "</div>"
+                    + "</body>"
+                    + "</html>";
+
+            cleanedHTML ="<html>"
+                    + "<body>"
+                    + "<div>"
+                    + "<h1>Page title <span>gos </span> here</h1>"
+                    + "<p>Page content goes here.</p>"
+                    + "<p><span>And </span> some <span>errrors </span> goes here.</p>"
+                    + "<p>We <span>shold </span> have both grammar and <span>spelings </span><span>erors </span>.</p>"
+                    + "<p>He <span>have </span> apples.</p>"
+                    + "<p><span>Un cuvant</span></p>"
+                    + "</div>"
+                    + "</body>"
+                    + "</html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+            cleanedXmlDoc.LoadXml(cleanedHTML);
+        }
+
+        /// <summary>
+        /// Test method for grammar and spelling errors filter.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            new GrammarAndSpellingErrorsFilter(manager).Filter(ref initialXmlDoc);
+            Assert.IsTrue(XmlDocComparator.AreIdentical(initialXmlDoc, cleanedXmlDoc));
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/LocalImageAdaptorFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/LocalImageAdaptorFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/LocalImageAdaptorFilterTest.cs	(revision 0)
@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using ContentFiltering.Office.Word.Filters;
+using System.Xml;
+using XWiki.Office.Word;
+using ContentFiltering.Test.Util;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>LocalImageAdaptorFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class LocalImageAdaptorFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private XmlDocument initialXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public LocalImageAdaptorFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            initialXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            initialHTML = "<html>"
+                    + "<body>"
+                    + "<h1>Heading 1</h1>"
+                    + "<p><span>"
+                    + "<img width=\"645\" height=\"459\" src=\"Document1_TempExport_files/image002.jpg\" alt=\"DevManager-server.png\" />"
+                    + "</span></p>"
+                    + "</body>"
+                    + "</html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+        }
+
+        /// <summary>
+        /// Test method for local image adaptor filter.
+        /// Verifies if images are 'bordered' with comments and image sources start with 'http'.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            new LocalImageAdaptorFilter(manager).Filter(ref initialXmlDoc);
+            XmlNodeList images=initialXmlDoc.GetElementsByTagName("img");
+            foreach (XmlNode image in images)
+            {
+                Assert.AreEqual(image.PreviousSibling.NodeType, XmlNodeType.Comment);
+                Assert.IsTrue(image.PreviousSibling.Value.IndexOf("startimage") >= 0);
+                Assert.AreEqual(image.NextSibling.NodeType, XmlNodeType.Comment);
+                Assert.IsTrue(image.NextSibling.Value.IndexOf("stopimage") >= 0);
+                Assert.IsTrue(image.Attributes["src"].Value.IndexOf("http") >= 0);
+            }
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/LocalMacrosAdaptorFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/LocalMacrosAdaptorFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/LocalMacrosAdaptorFilterTest.cs	(revision 0)
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>LocalMacrosAdaptorFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class LocalMacrosAdaptorFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+        private XmlDocument expectedXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public LocalMacrosAdaptorFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+            expectedXmlDoc = new XmlDocument();
+        }
+
+
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            //'known' macros
+            manager.States.Macros.Add("9225601", "generated html content");
+
+            initialHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w=\"urn:schemas-microsoft-com:office:word\" xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\" xmlns=\"http://www.w3.org/1999/xhtml\">"
+                    + "<body>"
+                    + "<h1>Heading 1</h1>"
+                    + "<p>Normal text</p>"
+                    + "<w:Sdt SdtLocked=\"t\" ContentLocked=\"t\" ID=\"9225601\">"
+                    + "<p>&lt;img border=\"0\" src=\"<span class=\"nobr\"><a href=\"http://opi.yahoo.com/online?u=yahoohelper&amp;amp;m=g&amp;amp;t=1\">"
+                    + "          http://opi.yahoo.com/online?u=yahoohelper&amp;amp;m=g&amp;amp;t=1</a></span>\" alt=\"yahoo yahoohelper\" /&gt;"
+                    + "<span><w:sdtPr></w:sdtPr></span>"
+                    + "</p>"
+                    + "</w:Sdt>"
+                    + "<w:Sdt DocPart=\"DefaultPlaceholder_22675703\" Text=\"t\" ID=\"15075750\"><p>Some text goes here"
+                    + "<w:sdtPr></w:sdtPr></p></w:Sdt><p>More text goes here.</p>"
+                    + "</body>"
+                    + "</html>";
+
+            expectedHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w=\"urn:schemas-microsoft-com:office:word\" xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\" xmlns=\"http://www.w3.org/1999/xhtml\">"
+                    + "<body>"
+                    + "<h1>Heading 1</h1>"
+                    + "<p>Normal text</p>"
+                    + "generated html content"
+                    + "<w:Sdt DocPart=\"DefaultPlaceholder_22675703\" Text=\"t\" ID=\"15075750\"><p>Some text goes here"
+                    + "<w:sdtPr></w:sdtPr></p></w:Sdt><p>More text goes here.</p>"
+                    + "</body>"
+                    + "</html>";
+
+            initialXmlDoc = new XmlDocument();
+            expectedXmlDoc = new XmlDocument();
+
+            initialXmlDoc.LoadXml(initialHTML);
+            expectedXmlDoc.LoadXml(expectedHTML);
+        }
+
+        /// <summary>
+        /// Test method for local macros adaptor filter.
+        /// Content controls which represent XWiki macros should be tranformed (in macros)
+        /// and content controls which belong to Word should not be altered.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            new LocalMacrosAdaptorFilter(manager).Filter(ref initialXmlDoc);
+            XmlNodeList stds = initialXmlDoc.GetElementsByTagName("Sdt", "urn:schemas-microsoft-com:office:word");
+            
+            bool foundElement9225601 = false;
+            bool foundElement15075750 = false;
+            
+            foreach (XmlNode std in stds)
+            {
+                if (std.Attributes["ID"] != null)
+                {
+                    if (std.Attributes["ID"].Value == "9225601")
+                    {
+                        foundElement9225601 = true;
+                    }
+                    if (std.Attributes["ID"].Value == "15075750")
+                    {
+                        foundElement15075750 = true;
+                    }
+                }
+            }
+
+            Assert.IsTrue(foundElement15075750);
+            Assert.IsFalse(foundElement9225601);
+
+            Assert.IsTrue(initialXmlDoc.InnerText.ToLower().IndexOf("generated html content") >= 0);
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/OfficeAttributesRemoverFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/OfficeAttributesRemoverFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/OfficeAttributesRemoverFilterTest.cs	(revision 0)
@@ -0,0 +1,78 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>OfficeAttributesRemoverFilter</code>.
+    /// </summary>
+    [TestFixture]    
+    public class OfficeAttributesRemoverFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+        private XmlDocument expectedXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public OfficeAttributesRemoverFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+            expectedXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            initialHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\""
+                + " xmlns:o=\"urn:schemas-microsoft-com:office:office\""
+                + " xmlns:w=\"urn:schemas-microsoft-com:office:word\""
+                + " xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\""
+                + " xmlns=\"http://www.w3.org/TR/REC-html40\" >"
+                + "<body>"
+                + "<p o:p=\"content\">o content</p>"
+                + "<p w:Std=\"content\">w content</p>"
+                + "<img src=\"img1.png\" v:shapes=\"_x0000_s1026\" />"
+                + "<p m:f=\"content\">m content</p>"
+                + "</body></html>";
+
+            expectedHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w=\"urn:schemas-microsoft-com:office:word\" xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\" xmlns=\"http://www.w3.org/TR/REC-html40\">"
+                + "<body>"
+                + "<p>o content</p>"
+                + "<p>w content</p>"
+                + "<img src=\"img1.png\" />"
+                + "<p>m content</p>"
+                + "</body></html>";
+
+
+            initialXmlDoc.LoadXml(initialHTML);
+            expectedXmlDoc.LoadXml(expectedHTML);
+        }
+
+        /// <summary>
+        /// Test method for office attributes remover filter.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            new OfficeAttributesRemoverFilter(manager).Filter(ref initialXmlDoc);
+            Assert.IsTrue(XmlDocComparator.AreIdentical(initialXmlDoc, expectedXmlDoc));
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/StyleRemoverFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/StyleRemoverFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/StyleRemoverFilterTest.cs	(revision 0)
@@ -0,0 +1,160 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>StyleRemoverFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class StyleRemoverFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+        private XmlDocument expectedXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public StyleRemoverFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+            expectedXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            initialHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\""
+                + " xmlns:o=\"urn:schemas-microsoft-com:office:office\""
+                + " xmlns:w=\"urn:schemas-microsoft-com:office:word\""
+                + " xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\""
+                + " xmlns=\"http://www.w3.org/TR/REC-html40\">"
+                + "<head><title>Title</title></head>"
+                + "<body style=\"tab-interval:.5in\">"
+                + "<div>"
+                + "<div style=\"mso-element:para-border-div;border:none;border-bottom:solid #4F81BD 1.0pt;"
+                + "mso-border-bottom-themecolor:accent1;padding:0in 0in 4.0pt 0in\"> "
+                + "<h1>Heading 1</h1>"
+                + "<h2>Heading 2</h2>"
+                + "<p class=\"MsoNormal\">Normal text content goes here.</p> "
+                + "<p class=\"MsoNormal\"><span style=\"so-no-proof:yes\">"
+                + "<img width=\"106\" height=\"106\" src=\"EraseMe001_files/image002.jpg\" alt=\"bg001.bmp\"/>"
+                + "</span></p>"
+                + "<table class=\"MsoNormalTable\" border=\"1\" cellspacing=\"0\" cellpadding=\"0\""
+                + " style=\"margin-left:12.2pt;border-collapse:collapse;border:none;mso-border-alt:"
+                + " solid windowtext .5pt;mso-padding-alt:0in 5.4pt 0in 5.4pt;mso-border-insideh:"
+                + " .5pt solid windowtext;mso-border-insidev:.5pt solid windowtext\"> "
+                + " <tr style=\"mso-yfti-irow:0;mso-yfti-firstrow:yes;height:21.05pt\"> "
+                + "  <td width=\"285\" colspan=\"3\" valign=\"top\" style=\"width:213.95pt;border:solid windowtext 1.0pt;"
+                + "  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:21.05pt\"> "
+                + "  <p class=\"MsoNormal\">1</p> "
+                + "  </td> "
+                + " </tr> "
+                + " <tr style=\"mso-yfti-irow:1;height:23.75pt\"> "
+                + "  <td width=\"78\" rowspan=\"2\" valign=\"top\" style=\"width:58.4pt;border:solid windowtext 1.0pt;"
+                + "  border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;"
+                + "  padding:0in 5.4pt 0in 5.4pt;height:23.75pt\"> "
+                + "  <p class=\"MsoNormal\" >2</p> "
+                + "  </td> "
+                + "  <td width=\"207\" colspan=\"2\" valign=\"top\" style=\"width:155.55pt;border-top:none;"
+                + "  border-left:none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;"
+                + "  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;"
+                + "  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:23.75pt\"> "
+                + "  <p class=\"MsoNormal\" >3</p> "
+                + "  </td> "
+                + " </tr> "
+                + " <tr style=\"mso-yfti-irow:2;mso-yfti-lastrow:yes;height:25.15pt\"> "
+                + "  <td width=\"90\" valign=\"top\" style=\"width:67.25pt;border-top:none;border-left:"
+                + "  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;"
+                + "  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;"
+                + "  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:25.15pt\"> "
+                + "  <p class=\"MsoNormal\" >4</p> "
+                + "  </td> "
+                + "  <td width=\"118\" valign=\"top\" style=\"width:88.3pt;border-top:none;border-left:"
+                + "  none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;"
+                + "  mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;"
+                + "  mso-border-alt:solid windowtext .5pt;padding:0in 5.4pt 0in 5.4pt;height:25.15pt\"> "
+                + "  <p class=\"MsoNormal\" >5</p> "
+                + "  </td> "
+                + " </tr> "
+                + "</table> "
+                + "<p class=\"MsoNoSpacing\">Some no spacing text content</p> "
+                + "</div></div>"
+                + "</body></html>";
+
+
+            expectedHTML = "<html  xmlns:v=\"urn:schemas-microsoft-com:vml\""
+                + " xmlns:o=\"urn:schemas-microsoft-com:office:office\""
+                + " xmlns:w=\"urn:schemas-microsoft-com:office:word\""
+                + " xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\""
+                + " xmlns=\"http://www.w3.org/TR/REC-html40\">"
+                + "<head><title>Title</title></head>"
+                + "<body>"
+                + "<div>"
+                + "<div>"
+                + "<h1>Heading 1</h1>"
+                + "<h2>Heading 2</h2>"
+                + "<p>Normal text content goes here.</p> "
+                + "<p><span>"
+                + "<img width=\"106\" height=\"106\" src=\"EraseMe001_files/image002.jpg\" alt=\"bg001.bmp\"/>"
+                + "</span></p>"
+                + "<table border=\"1\" cellspacing=\"0\" cellpadding=\"0\">"
+                + " <tr> "
+                + "  <td colspan=\"3\" > "
+                + "  <p>1</p> "
+                + "  </td> "
+                + " </tr> "
+                + " <tr> "
+                + "  <td rowspan=\"2\"> "
+                + "  <p>2</p> "
+                + "  </td> "
+                + "  <td colspan=\"2\"> "
+                + "  <p>3</p> "
+                + "  </td> "
+                + " </tr> "
+                + " <tr> "
+                + "  <td > "
+                + "  <p>4</p> "
+                + "  </td> "
+                + "  <td > "
+                + "  <p>5</p> "
+                + "  </td> "
+                + " </tr> "
+                + "</table> "
+                + "<p>Some no spacing text content</p> "
+                + "</div></div>"
+                + "</body></html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+            expectedXmlDoc.LoadXml(expectedHTML);
+        }
+
+        /// <summary>
+        /// Test method for style remover filter. Verifies if styles and attributes that sould be transformed in CSS (like width, height) 
+        /// are removed, but other attributes (like colspan, rowspan) are preserved.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            StyleRemoverFilter styleRemoverFilter = new StyleRemoverFilter(manager);
+            styleRemoverFilter.Filter(ref initialXmlDoc);
+            Assert.IsTrue(XmlDocComparator.AreIdentical(initialXmlDoc, expectedXmlDoc));
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/WebImageAdaptorFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/WebImageAdaptorFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/WebImageAdaptorFilterTest.cs	(revision 0)
@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+using XWiki.Office.Word;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>WebImageAdaptorFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class WebImageAdaptorFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private XmlDocument initialXmlDoc;
+
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public WebImageAdaptorFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            initialXmlDoc = new XmlDocument();
+        }
+        /// <summary>
+        /// Initialize the test.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetUp()
+        {
+            initialHTML = "<html  xmlns:v=\"urn:schemas-microsoft-com:vml\""
+                + " xmlns:o=\"urn:schemas-microsoft-com:office:office\""
+                + " xmlns:w=\"urn:schemas-microsoft-com:office:word\""
+                + " xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\""
+                + " xmlns=\"http://www.w3.org/TR/REC-html40\">"
+                + "<head><title>WebImageAdaptorFilterTest</title></head>"
+                + "<body>"
+                + "<img v:shapes=\"shape1\" alt=\"alternative text\" src=\"http://127.0.0.1:8080/xwiki/bin/download/Space1/Page1/image002.jpg\" />"
+                +"</body></html>";
+
+            //are atributul ImageInfo.XWORD_IMG_ATTRIBUTE
+            //are atributul alt 
+            //src-ul e file://
+            //nu are attributul v:shapes
+            initialXmlDoc.LoadXml(initialHTML);
+        }
+
+        /// <summary>
+        /// Test method for web image adaptor filter. After filterning images should have <code>ImageInfo.XWORD_IMG_ATTRIBUTE</code> and 'alt' attributes,
+        /// the 'src' should start with 'file://' and the 'v:shapes' attribute should not be present.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            WebImageAdaptorFilter webImageAdaptorFilter = new WebImageAdaptorFilter(manager);
+            webImageAdaptorFilter.Filter(ref initialXmlDoc);
+
+            XmlNodeList images = initialXmlDoc.GetElementsByTagName("img");
+            foreach (XmlNode image in images)
+            {
+                Assert.IsNotNull(image.Attributes[ImageInfo.XWORD_IMG_ATTRIBUTE]);
+                Assert.AreEqual(image.Attributes["alt"].Value, "alternative text");
+                Assert.IsTrue(image.Attributes["src"].Value.IndexOf("file://") >= 0);
+                Assert.IsNull(image.Attributes["v:shapes"]);
+            }
+            
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/WebListsAdaptorFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/WebListsAdaptorFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/WebListsAdaptorFilterTest.cs	(revision 0)
@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using XWiki.Office.Word;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>WebListsAdaptorFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class WebListsAdaptorFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+        private XmlDocument expectedXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public WebListsAdaptorFilterTest()
+        {
+            manager=ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML="";
+            expectedHTML="";
+            initialXmlDoc=new XmlDocument();
+            expectedXmlDoc=new XmlDocument();
+        }
+
+        /// <summary>
+        /// Test setup.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetup()
+        {
+            initialHTML = "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">"
+                    + "<head><title>Some Lists</title></head>"
+                    + "<body id=\"body\" class=\"xwiki viewbody hideleft\">"
+                    + "<p>Unordered list:</p>"
+                    + "<ul>"
+                    + "<li>Item 1</li>"
+                    + "<li>Item2<ul>"
+                    + "    <li>Item 2.1</li>"
+                    + "    <li>Item 2.2<ul>"
+                    + "        <li>Item 2.2.1</li>"
+                    + "        <li>Item 2.2.2</li>"
+                    + "        </ul>"
+                    + "    </li>"
+                    + "    <li>Item 2.3</li>"
+                    + "    </ul>"
+                    + "</li>"
+                    + "<li>Item 3</li>"
+                    + "</ul>"
+                    + "<p>Ordered list:</p>"
+                    + "<ol>"
+                    + "<li>Item 1<ol>"
+                    + "    <li>Item 1.1</li>"
+                    + "    <li>Item 1.2</li>"
+                    + "    </ol>"
+                    + "</li>"
+                    + "<li>Item 2</li>"
+                    + "</ol>"
+                    + "<p>End of file :-)</p>"
+                    + "</body>"
+                    + "</html>";
+
+            expectedHTML = "<html xmlns=\"http://www.w3.org/1999/xhtml\" lang=\"en\" xml:lang=\"en\">"
+                    + "<head><title>Some Lists</title></head>"
+                    + "<body id=\"body\" class=\"xwiki viewbody hideleft\">"
+                    + "<p>Unordered list:</p>"
+                    + "<ul>"
+                    + "<li>Item 1</li>"
+                    + "<li>Item2</li>"
+                    + "<ul>"
+                    + "    <li>Item 2.1</li>"
+                    + "    <li>Item 2.2</li>"
+                    + "    <ul>"
+                    + "        <li>Item 2.2.1</li>"
+                    + "        <li>Item 2.2.2</li>"
+                    + "    </ul>"
+                    + "    <li>Item 2.3</li>"
+                    + "</ul>"
+                    + "<li>Item 3</li>"
+                    + "</ul>"
+                    + "<p>Ordered list:</p>"
+                    + "<ol>"
+                    + "<li>Item 1</li>"
+                    + "<ol>"
+                    + "   <li>Item 1.1</li>"
+                    + "   <li>Item 1.2</li>"
+                    + "</ol>"
+                    + "<li>Item 2</li>"
+                    + "</ol>"
+                    + "<p>End of file :-)</p>"
+                    + "</body>"
+                    + "</html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+            
+            expectedXmlDoc.LoadXml(expectedHTML);
+        }
+
+        /// <summary>
+        /// Test method for web lists adaptor filter.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            WebListsAdaptorFilter webListsAdaptorFilter = new WebListsAdaptorFilter(manager);
+            webListsAdaptorFilter.Filter(ref initialXmlDoc);
+            Assert.IsTrue(XmlDocComparator.AreIdentical(initialXmlDoc, expectedXmlDoc));
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Office/Word/Filters/WebMacrosAdaptorFilterTest.cs
===================================================================
--- xword/ContentFiltering/Test/Office/Word/Filters/WebMacrosAdaptorFilterTest.cs	(revision 0)
+++ xword/ContentFiltering/Test/Office/Word/Filters/WebMacrosAdaptorFilterTest.cs	(revision 0)
@@ -0,0 +1,116 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using NUnit.Framework;
+using XWiki.Office.Word;
+using System.Xml;
+using ContentFiltering.Test.Util;
+using ContentFiltering.Office.Word.Filters;
+
+namespace ContentFiltering.Test.Office.Word.Filters
+{
+    /// <summary>
+    /// Test class for <code>WebMacrosAdaptorFilter</code>.
+    /// </summary>
+    [TestFixture]
+    public class WebMacrosAdaptorFilterTest
+    {
+        private ConversionManager manager;
+        private string initialHTML;
+        private string expectedHTML;
+        private XmlDocument initialXmlDoc;
+
+        /// <summary>
+        /// Default constructor.
+        /// </summary>
+        public WebMacrosAdaptorFilterTest()
+        {
+            manager = ConversionManagerTestUtil.DummyConversionManager();
+            initialHTML = "";
+            expectedHTML = "";
+            initialXmlDoc = new XmlDocument();
+        }
+
+        /// <summary>
+        /// Global test setup.
+        /// </summary>
+        [TestFixtureSetUp]
+        public void GlobalSetup()
+        {
+            initialHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w=\"urn:schemas-microsoft-com:office:word\" xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\" xmlns=\"http://www.w3.org/1999/xhtml\">"
+                + "<body>"
+                + "<p>Normal text.</p>"
+                + "<!--startmacro:velocity|-||-|#yahoo(\"yahoohelper\")-->"
+                + "<p>generated html</p>"
+                + "<!--stopmacro-->"
+                + "</body></html>";
+
+            expectedHTML = "<html xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:w=\"urn:schemas-microsoft-com:office:word\" xmlns:m=\"http://schemas.microsoft.com/office/2004/12/omml\" xmlns=\"http://www.w3.org/1999/xhtml\">"
+                + "<body>"
+                + "<p>Normal text.</p>"
+                + "<w:Sdt SdtLocked=\"t\" ContentLocked=\"t\" DocPart=\"DefaultPlaceholder_9128480\" ID=\"9320493\">"
+                + "<!--startmacro:velocity|-||-|#yahoo(\"yahoohelper\")-->"
+                + "<p>generated html</p>"
+                + "<!--stopmacro-->"
+                + "</w:Sdt>"
+                + "</body></html>";
+
+            initialXmlDoc.LoadXml(initialHTML);
+        }
+
+        /// <summary>
+        /// Test method for web macros adaptor filter. After filtering the XmlDocument should have one content control
+        /// (w:Std) with 'ContentLocked', 'DocPart', 'ID' attributes and 'startmacro','stopmacro' and macro generated html
+        /// as child nodes.
+        /// </summary>
+        [Test]
+        public void TestFilter()
+        {
+            WebMacrosAdaptorFilter webmacrosAdaptorFilter = new WebMacrosAdaptorFilter(manager);
+            webmacrosAdaptorFilter.Filter(ref initialXmlDoc);
+
+            XmlNodeList wStds = initialXmlDoc.GetElementsByTagName("Sdt", "urn:schemas-microsoft-com:office:word");
+            Assert.AreEqual(wStds.Count, 1);
+            XmlNode wStd = wStds[0];
+            Assert.AreEqual(wStd.Attributes["ContentLocked"].Value, "t");
+            Assert.IsTrue(wStd.Attributes["DocPart"].Value.IndexOf("DefaultPlaceholder_") >= 0);
+            Assert.IsNotNull(wStd.Attributes["ID"]);
+            XmlNodeList wSdChildNodes = wStd.ChildNodes;
+
+            bool foundStartMacro = false;
+            bool foundGeneratedHtml = false;
+            bool foundStopMacro = false;
+
+            foreach (XmlNode child in wSdChildNodes)
+            {
+                if (child.NodeType == XmlNodeType.Comment)
+                {
+                    if (child.InnerText.IndexOf("startmacro") >= 0)
+                    {
+                        foundStartMacro = true;
+                    }
+                    if (child.InnerText.IndexOf("stopmacro") >= 0)
+                    {
+                        foundStopMacro = true;
+                    }
+                }
+                else
+                {
+                    if (child.Name == "p")
+                    {
+                        if (child.InnerText == "generated html")
+                        {
+                            foundGeneratedHtml = true;
+                        }
+                    }
+                }
+            }
+
+            Assert.IsTrue(foundStartMacro);
+            Assert.IsTrue(foundGeneratedHtml);
+            Assert.IsTrue(foundStopMacro);
+            
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Util/ConversionManagerUtil.cs
===================================================================
--- xword/ContentFiltering/Test/Util/ConversionManagerUtil.cs	(revision 0)
+++ xword/ContentFiltering/Test/Util/ConversionManagerUtil.cs	(revision 0)
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using XWiki.Office.Word;
+using XWiki.Clients;
+
+namespace ContentFiltering.Test.Util
+{
+    public class ConversionManagerTestUtil
+    {
+        private static string serverURL = "http://127.0.0.1:8080";
+        private static string localFolder = "localFolder";
+        private static string docFullName = "docFullName";
+        private static string localFileName = "localFileName";
+
+        /// <summary>
+        /// Creates a dummy <code>ConverionManeger</code> to be used by unit tests.
+        /// </summary>
+        /// <returns>An instance of a dummy <code>ConversionManager</code></returns>
+        public static ConversionManager DummyConversionManager()
+        {
+            IXWikiClient client = null;
+            client = XWikiClientTestUtil.CreateMockInstance();
+            return new ConversionManager(serverURL, localFolder, docFullName, localFileName, client);
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Util/XmlDocComparator.cs
===================================================================
--- xword/ContentFiltering/Test/Util/XmlDocComparator.cs	(revision 0)
+++ xword/ContentFiltering/Test/Util/XmlDocComparator.cs	(revision 0)
@@ -0,0 +1,120 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml;
+using System.Collections;
+
+namespace ContentFiltering.Test.Util
+{
+    public class XmlDocComparator
+    {
+        /// <summary>
+        /// Compares two <code>XmlDocument</code>s.
+        /// Returns TRUE if the xml dcouments have the same nodes, in the same position with the exact attributes.
+        /// </summary>
+        /// <returns>True if the xml dcouments have the same nodes, in the same position with the exact attributes.</returns>
+        public static bool AreIdentical(XmlDocument xmlDoc1,XmlDocument xmlDoc2)
+        {
+            XmlNodeList nodeList1 = xmlDoc1.ChildNodes;
+            XmlNodeList nodeList2 = xmlDoc2.ChildNodes;
+            bool same = true;
+            
+            if (nodeList1.Count != nodeList2.Count)
+            {
+                return false;
+            }
+
+            IEnumerator enumerator1 = nodeList1.GetEnumerator();
+            IEnumerator enumerator2 = nodeList2.GetEnumerator();
+            while (enumerator1.MoveNext() && enumerator2.MoveNext() && same)
+            {
+                same = CompareNodes((XmlNode)enumerator1.Current, (XmlNode)enumerator2.Current);
+            }
+            return same;
+        }
+
+        private static bool CompareNodes(XmlNode node1, XmlNode node2)
+        {
+            //compare properties
+            if (node1.Attributes == null||node2.Attributes==null)
+            {
+                bool nullAttributes = (node1.Attributes == null && node2.Attributes == null);
+                if (!nullAttributes)
+                {
+                    return false;
+                }
+            }
+            else
+            {
+                if (node1.Attributes.Count != node2.Attributes.Count)
+                {
+                    Console.WriteLine("Attributes count: " + node1.Attributes.Count + "!=" + node2.Attributes.Count);
+                    Console.WriteLine(node1.ParentNode.InnerXml);
+                    Console.WriteLine(node2.ParentNode.InnerXml);
+                    return false;
+                }
+            }
+            if (node1.ChildNodes.Count != node2.ChildNodes.Count)
+            {
+                Console.WriteLine("Child nodes count: " + node1.ChildNodes.Count + " !=" + node2.ChildNodes.Count);
+                return false;
+            }
+
+            if (node1.Name != node2.Name)
+            {
+                Console.WriteLine("Nodes Name: " + node1.Name + "!=" + node2.Name);
+                return false;
+            }
+
+            if (node1.NodeType != node2.NodeType)
+            {
+                Console.WriteLine("Nodes Type: " + node1.NodeType + "!=" + node2.NodeType);
+                return false;
+            }
+
+            if ((""+node1.Value).Trim() != (""+node2.Value).Trim())
+            {
+                Console.WriteLine("Nodes value: " + node1.Value + "!=" + node2.Value);
+                return false;
+            }
+
+
+            //compare attributes
+            XmlAttribute attribute;
+            if (node1.Attributes != null && node2.Attributes != null)
+            {
+                foreach (XmlAttribute attr in node1.Attributes)
+                {
+                    attribute = node2.Attributes[attr.Name];
+                    if (attribute == null)
+                    {
+                        Console.WriteLine("Null attribute: " + attr.Name);
+                        return false;
+                    }
+                    if (attribute.Value != attr.Value)
+                    {
+                        Console.WriteLine("Attribute values: " + attribute.Value + "!=" + attr.Value);
+                        return false;
+                    }
+                }
+            }
+            //compare child nodes
+            IEnumerator enumerator1 = node1.GetEnumerator();
+            IEnumerator enumerator2 = node2.GetEnumerator();
+            bool childrenOK = true;
+            while (enumerator1.MoveNext() && enumerator2.MoveNext())
+            {
+                childrenOK = CompareNodes((XmlNode)enumerator1.Current, (XmlNode)enumerator2.Current);
+                if (!childrenOK)
+                {
+                    return false;
+                }
+            }
+
+
+            //same properties, same attributes, same child nodes
+            return true;
+        }
+    }
+}
Index: xword/ContentFiltering/Test/Util/XWikiClientUtil.cs
===================================================================
--- xword/ContentFiltering/Test/Util/XWikiClientUtil.cs	(revision 0)
+++ xword/ContentFiltering/Test/Util/XWikiClientUtil.cs	(revision 0)
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using XWiki.Clients;
+using NUnit.Mocks;
+
+namespace ContentFiltering.Test.Util
+{
+    public class XWikiClientTestUtil
+    {
+        /// <summary>
+        /// Returns an IXWikiClient mock implementation to be used by unit tests.
+        /// </summary>
+        /// <returns>An IXWikiClient mock instance.</returns>
+        public static IXWikiClient CreateMockInstance()
+        {
+            DynamicMock myXWikiClientMock=new DynamicMock(typeof(IXWikiClient));
+            myXWikiClientMock.ExpectAndReturn("Login", true,new object[2]);
+            myXWikiClientMock.ExpectAndReturn("GetAvailableSyntaxes", new List<string>() { "XWiki 2.0", "XHTML" });
+            myXWikiClientMock.ExpectAndReturn("GetPagesNames", new List<string>() { "Page1" }, new object[1]);
+            myXWikiClientMock.ExpectAndReturn("SavePageHTML", true,new object[3]);
+            myXWikiClientMock.ExpectAndReturn("AddAttachment", true, new object[2] { "docFullName", "localFolder\\Document1_TempExport_files/image002.jpg" });
+            myXWikiClientMock.ExpectAndReturn("GetAttachmentURL", "http://127.0.0.1:8080/xwiki/bin/download/Main/Page1/image002.jpg", new object[] { "docFullName","image002.jpg" });
+
+            return (IXWikiClient)myXWikiClientMock.MockInstance;
+        }
+    }
+
+ 
+}