diff --git a/ktwebservice/nunit/query.cs b/ktwebservice/nunit/query.cs
index 44cb4f2..96eb261 100644
--- a/ktwebservice/nunit/query.cs
+++ b/ktwebservice/nunit/query.cs
@@ -7,16 +7,16 @@ namespace MonoTests.KnowledgeTree
 	[TestFixture]
 	public class QueryTest : KTTest
     	{
- 
+
 
 		[SetUp]
 		public void SetUp()
-		{ 
+		{
 		}
 
 		[TearDown]
 		public void TearDown()
-		{ 
+		{
 		}
 
 		[Test]
@@ -24,35 +24,38 @@ namespace MonoTests.KnowledgeTree
 		{
 			Document doc = new Document(0,this._session, this._kt, false, false);
 			doc.createFile(1);
-			kt_search_response response = this._kt.search(this._session, "Filesize = \"13\"", "");
+			int filesize = doc.content.Length+1;
+			kt_search_response response = this._kt.search(this._session, "Filesize = \""+filesize+"\"", "");
 
 			Assert.AreEqual(0,response.status_code);
-			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize); 
+			Assert.AreEqual("n/a", response.hits[0].custom_document_no);
+			Assert.AreEqual("n/a", response.hits[0].oem_document_no);
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
 			Assert.AreEqual(doc.title,response.hits[0].title);
-			Assert.AreEqual(doc.realFilename,response.hits[0].filename); 
-			
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
 			response = this._kt.search(this._session, "DocumentId = \""+ response.hits[0].document_id +"\"", "");
 
 			Assert.AreEqual(0,response.status_code);
-			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize); 
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
 			Assert.AreEqual(doc.title,response.hits[0].title);
-			Assert.AreEqual(doc.realFilename,response.hits[0].filename); 	
-			
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
 			response = this._kt.search(this._session, "Title = \""+ response.hits[0].title +"\"", "");
 
 			Assert.AreEqual(0,response.status_code);
-			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize); 
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
 			Assert.AreEqual(doc.title,response.hits[0].title);
-			Assert.AreEqual(doc.realFilename,response.hits[0].filename); 
-					
-			
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
+
 			response = this._kt.search(this._session, "Filename = \""+ response.hits[0].filename +"\"", "");
 
 			Assert.AreEqual(0,response.status_code);
-			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize); 
+			Assert.AreEqual(doc.content.Length + 1,response.hits[0].filesize);
 			Assert.AreEqual(doc.title,response.hits[0].title);
-			Assert.AreEqual(doc.realFilename,response.hits[0].filename); 
-			
+			Assert.AreEqual(doc.realFilename,response.hits[0].filename);
+
 			doc.deleteFile();
     		}
 	}