--- a/python/testhexfile.py	Wed Jul 24 19:47:13 2013 +0200
+++ b/python/testhexfile.py	Wed Jul 24 22:40:29 2013 +0200
@@ -10,12 +10,46 @@
         hf2 = HexFile()
         hf2.load(io.StringIO(f.getvalue()))
         self.assertEqual(hf, hf2)
-        
-    def testSave(self):
+
+    def testSave1(self):
         hf = HexFile()
         hf.addRegion(0x8000, bytes.fromhex('aabbcc'))
         self.saveload(hf)
 
+    def testSave2(self):
+        hf = HexFile()
+        hf.addRegion(0x8000, bytes.fromhex('aabbcc'))
+        hf.addRegion(0x118000, bytes.fromhex('aabbcc'))
+        self.saveload(hf)
+
+    def testSave3(self):
+        hf = HexFile()
+        hf.addRegion(0x8000, bytes.fromhex('aabbcc'))
+        hf.addRegion(0xFFFE, bytes.fromhex('aabbcc'))
+        self.saveload(hf)
+
+    def testSave4(self):
+        hf = HexFile()
+        hf.addRegion(0xF000, bytes.fromhex('ab')*0x20000)
+        self.saveload(hf)
+
+    def testSave5(self):
+        hf = HexFile()
+        hf.addRegion(0xF003, bytes.fromhex('ab')*0x20000)
+        self.saveload(hf)
+
+    def testMerge(self):
+        hf = HexFile()
+        hf.addRegion(0x10, bytes.fromhex('abcdab'))
+        hf.addRegion(0x13, bytes.fromhex('abcdab'))
+        self.assertEqual(1, len(hf.regions))
+
+    def testOverlapped(self):
+        hf = HexFile()
+        hf.addRegion(0x10, bytes.fromhex('abcdab'))
+        with self.assertRaisesRegex(HexFileException, 'verlap'):
+            hf.addRegion(0x12, bytes.fromhex('abcdab'))
+
     def testEqual(self):
         hf1 = HexFile()
         hf2 = HexFile()
@@ -29,7 +63,7 @@
         hf1.addRegion(10, bytes.fromhex('aabbcc'))
         hf2.addRegion(10, bytes.fromhex('aabbdc'))
         self.assertNotEqual(hf1, hf2)
-        
+
     def testNotEqual2(self):
         hf1 = HexFile()
         hf2 = HexFile()