diff --git a/ts3/__init__.py b/ts3/__init__.py
index 16b6ea2..11c38ca 100644
--- a/ts3/__init__.py
+++ b/ts3/__init__.py
@@ -214,7 +214,7 @@ class TS3Proto():
             if len(chunk) > 1:
                 if len(chunk) > 2:
                     # value can contain '=' which may confuse our parser
-                    chunk = [v[0], '='.join(v[1:])]
+                    chunk = [chunk[0], '='.join(chunk[1:])]
                 
                 key, value = chunk
                 parsed_data[key] = TS3Proto._unescape_str(value)
diff --git a/ts3/test.py b/ts3/test.py
index 7e1ba31..f54b7b8 100644
--- a/ts3/test.py
+++ b/ts3/test.py
@@ -14,28 +14,28 @@ class TS3ProtoTest(unittest.TestCase):
         expected = r'\p\/\sabcdefg\p\s\p'
 
         res = self.ts3._escape_str(teststr)
-        self.assertTrue(res, expected)
+        self.assertEqual(res, expected)
 
     def testControlEscaping(self):
 
         teststr = "\n\r\t"
         expected = r'\n\r\t'
 
-        self.assertTrue(self.ts3._escape_str(teststr), expected)
+        self.assertEqual(self.ts3._escape_str(teststr), expected)
 
     def testCharacterUnEscaping(self):
 
         teststr = r'\p\/\sabcdefg\p\s\p'
         expected = '|/ abcdefg| |'
 
-        self.assertTrue(self.ts3._unescape_str(teststr), expected)
+        self.assertEqual(self.ts3._unescape_str(teststr), expected)
 
     def testFullCircle(self):
 
         teststr = '|/ abcdefg| |'
         res = self.ts3._unescape_str(self.ts3._escape_str(teststr))
 
-        self.assertTrue(res, teststr)
+        self.assertEqual(res, teststr)
 
     def testConstructBasic(self):
         self.assertEqual(self.ts3.construct_command('testcommand'), 'testcommand')
@@ -45,6 +45,25 @@ class TS3ProtoTest(unittest.TestCase):
         self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': 'test'}), 'testcommand key2=test key1=test')
         self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': [1, 2, 3]}), 'testcommand key2=1|key2=2|key2=3 key1=test')
         self.assertEqual(self.ts3.construct_command('testcommand', keys={'key1': 'test', 'key2': 'test'}, opts=['test']), 'testcommand key2=test key1=test -test')
+    
+    def testParseData(self):
+        # some response examples taken from http://media.teamspeak.com/ts3_literature/TeamSpeak%203%20Server%20Query%20Manual.pdf
+
+        data = 'timestamp=1259356318 level=4 channel=Query msg=query\sfrom\s87.163.52.195:9\sissued:\slogview\slimitcount=30|timestamp=1259356148'
+        parsed = [{'msg': 'query from 87.163.52.195:9 issued: logview limitcount=30', 'timestamp': '1259356318', 'channel': 'Query', 'level': '4'}, {'timestamp': '1259356148'}]
+
+        self.assertEqual(self.ts3.parse_data(data), parsed)
+
+        data = 'cid=2 cldbid=9 cgid=9|cid=2 cldbid=24 cgid=9|cid=2 cldbid=47 cgid=9'
+        parsed = [{'cgid': '9', 'cldbid': '9', 'cid': '2'}, {'cgid': '9', 'cldbid': '24', 'cid': '2'}, {'cgid': '9', 'cldbid': '47', 'cid': '2'}]
+
+        self.assertEqual(self.ts3.parse_data(data), parsed)
+
+        data = 'client_unique_identifier=P5H2hrN6+gpQI4n\/dXp3p17vtY0= client_nickname=Rabe85 client_version=3.0.0-alpha24\s[Build:\s8785]\s(UI:\s8785)'
+        parsed = {'client_unique_identifier': 'P5H2hrN6+gpQI4n/dXp3p17vtY0=', 'client_version': '3.0.0-alpha24 [Build: 8785] (UI: 8785)', 'client_nickname': 'Rabe85'}
+
+        self.assertEqual(self.ts3.parse_data(data), parsed)
+
 
 def suite():
     suite = unittest.TestSuite()