diff --git a/tests/metadatatests.py b/tests/metadatatests.py
index 32bd9a96..a37380c4 100644
--- a/tests/metadatatests.py
+++ b/tests/metadatatests.py
@@ -21,13 +21,13 @@ class MetaDataTestCase(unittest.TestCase):
         
     def testRead(self):
         md = metadata.MetaData()
-        md.read('tests/sandbox/metadata.xml')
+        md.read('tests/popt/metadata.xml')
 
         self.assertEqual(md.package.license, ["As-Is"])
 
         self.assertEqual(md.package.version, "1.7")
 
-        self.assertEqual(md.package.installedSize, 546542)
+        self.assertEqual(md.package.installedSize, 149691)
         return md
     
     def testWrite(self):
diff --git a/tests/popt/metadata.xml b/tests/popt/metadata.xml
new file mode 100644
index 00000000..873d0d6a
--- /dev/null
+++ b/tests/popt/metadata.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" ?>
+<PISI>
+	<Source>
+		<Name>
+			popt
+		</Name>
+		<Packager>
+			<Name>
+				Kırmızı kafalar
+			</Name>
+			<Email>
+				hotmail@redhat.com
+			</Email>
+		</Packager>
+	</Source>
+	<Package>
+		<Name>
+			popt-libs
+		</Name>
+		<Summary>
+			Command line option parsing library
+		</Summary>
+		<Description>
+			library files for popt
+		</Description>
+		<License>
+			As-Is
+		</License>
+		<IsA>
+			library:util:optparser
+		</IsA>
+		<PartOf>
+			rpm:archive
+		</PartOf>
+		<RuntimeDependencies>
+			<Dependency>
+				gettext
+			</Dependency>
+		</RuntimeDependencies>
+		<Files>
+			<Path fileType="sharedLib">
+				/usr/lib
+			</Path>
+			<Path fileType="doc">
+				/usr/share/doc
+			</Path>
+			<Path fileType="doc">
+				/usr/share/man
+			</Path>
+			<Path fileType="localedata">
+				/usr/share/locale
+			</Path>
+			<Path fileType="header">
+				/usr/include/popt.h
+			</Path>
+		</Files>
+		<History>
+			<Update>
+				<Date>
+					06/14/2005
+				</Date>
+				<Version>
+					1.7
+				</Version>
+				<Release>
+					3
+				</Release>
+			</Update>
+			<Update>
+				<Date>
+					06/10/2005
+				</Date>
+				<Version>
+					1.7
+				</Version>
+				<Release>
+					2
+				</Release>
+			</Update>
+			<Update>
+				<Date>
+					05/05/2005
+				</Date>
+				<Version>
+					1.7
+				</Version>
+				<Release>
+					1
+				</Release>
+			</Update>
+		</History>
+		<Build>
+			0
+		</Build>
+		<Distribution>
+			Pardus
+		</Distribution>
+		<DistributionRelease>
+			0.1
+		</DistributionRelease>
+		<Architecture>
+			Any
+		</Architecture>
+		<InstalledSize>
+			149691
+		</InstalledSize>
+	</Package>
+</PISI>
diff --git a/tests/sandbox/a.xml b/tests/sandbox/a.xml
deleted file mode 100644
index 375d2644..00000000
--- a/tests/sandbox/a.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<A href="http://www.cs.bilkent.edu.tr/~erayo">
-  <Name>Eray Ozkural</Name>
-  <Number>868</Number>
-  <Projects>
-      <Project>pisi</Project>
-      <Project>noatun</Project>
- </Projects>
-</A>
diff --git a/tests/sandbox/files.xml b/tests/sandbox/files.xml
deleted file mode 100644
index bb4b9533..00000000
--- a/tests/sandbox/files.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-placeholder
-
diff --git a/tests/sandbox/metadata.xml b/tests/sandbox/metadata.xml
deleted file mode 100644
index 9e2d9679..00000000
--- a/tests/sandbox/metadata.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-
-<PISI>
-
-  <Source>
-  <Name>sandbox</Name>
-  <Summary>We should have something to say here.</Summary>
-  <Packager>
-    <Name>Meral</Name>
-    <Email>meren@uludag.org.tr</Email>
-  </Packager>
-  </Source>
-
-  <Package>
-  <Name>sandbox</Name>
-  <Summary lang="tr">Bla</Summary>
-  <Description>Life sucks then you die</Description>
-  <Homepage>http://cekirdek.uludag.org.tr/~meren/</Homepage>
-  <IsA>temprorary:zip</IsA>
-  <PartOf>tools:archive</PartOf>
-  <License>As-Is</License>
-  <History>
-    <Update>
-      <Date>06/15/2005</Date>
-      <Version>1.7</Version>
-      <Release>1</Release>
-	  <Build>0</Build>
-    </Update>
-  </History>
-  <Files>
-    <File>
-      <Path>/</Path>
-    </File>
-  </Files>
-  <Distribution>Pardus</Distribution>
-  <DistributionRelease>0.1</DistributionRelease>
-  <Architecture>x86</Architecture>
-  <InstalledSize>546542</InstalledSize>
-  </Package>
-
-</PISI>
diff --git a/tests/sandbox/pspec.xml b/tests/sandbox/pspec.xml
deleted file mode 100644
index 98e279dd..00000000
--- a/tests/sandbox/pspec.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-
-<!DOCTYPE PSPEC SYSTEM
-	  "http://www.uludag.org.tr/projeler/pisi/pisi-spec.dtd">
-
-<PISI>
-
-  <Source>
-    <Name>sandbox</Name>
-    <Homepage>http://cekirdek.uludag.org.tr/</Homepage>
-    <Summary lang="tr">Test packati</Summary>
-    <Description lang="tr">Sandbox: Test paketi...</Description>
-    <Packager>
-      <Name>A. Murat Eren</Name>
-      <Email>meren@uludag.org.tr</Email>
-    </Packager>
-    <License>As-Is</License>
-    <Archive type="zip" sha1sum="5f793136fca29dc8b8b19d75eb1c76241ca90755">
-        http://cekirdek.uludag.org.tr/sandbox.zip
-    </Archive>
-    <History>
-      <Update>
-	<Date>06/15/2005</Date>
-	<Version>0.1</Version>
-	<Release>1</Release>
-      </Update>
-    </History>
-  </Source>
-
-  <Package>
-    <Name>sandbox</Name>
-    <Category>temprorary:zip</Category>
-    <Files>
-      <File>
-	<Path>/</Path>
-      </File>
-    </Files>
-  </Package>
-</PISI>