diff --git a/party/__init__.py b/party/__init__.py
index 32b2c7c..8c99c0d 100644
--- a/party/__init__.py
+++ b/party/__init__.py
@@ -10,6 +10,11 @@ class Database(Enum):
     Users = 1
     Games = 2
 
+class MateMarke(Enum):
+    ClubMate = "Club Mate"
+    FloraPower = "Flora Power"
+    MioMioMate = "MioMio Mate"
+
 messagesDB = redis.Redis(host='localhost', port=6379, db=Database.Messages.value)
 users = redis.Redis(host='localhost', port=6379, db=Database.Users.value)
 games = redis.Redis(host='localhost', port=6379, db=Database.Games.value)
diff --git a/party/mate.py b/party/mate.py
new file mode 100644
index 0000000..16f85c4
--- /dev/null
+++ b/party/mate.py
@@ -0,0 +1,18 @@
+from party import MateMarke as Marke
+
+class MateKiste:
+    def __init__(self, flaschen_anzahl: int, marke: Marke):
+        self.flaschen_anzahl = flaschen_anzahl
+        self.marke = marke
+
+    def eineTrinken(self):
+        self.flaschen_anzahl = self.flaschen_anzahl - 1
+
+    def getFlaschenAnzahl(self) -> int:
+        return self.flaschen_anzahl
+
+    def getMarke(self) -> Marke:
+        return self.marke
+
+    def getMarkeName(self) -> str:
+        return self.marke.value
diff --git a/tests/__init__.py b/tests/__init__.py
index b063727..5398341 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -1,6 +1,7 @@
 import pytest
-from party import create_app, Database, chat as c
+from party import create_app, Database, chat as c, MateMarke
 from party import message as m
+from party.mate import MateKiste
 
 
 @pytest.fixture
@@ -28,3 +29,9 @@ def chat():
 def message():
     message = m.Message('author', 'content', 'timestamp', 0)
     yield message
+
+@pytest.fixture
+def mateKiste():
+    mateKiste = MateKiste(20, MateMarke.ClubMate)
+    yield mateKiste
+
diff --git a/tests/test_chat.py b/tests/test_chat.py
index a185700..01ad380 100644
--- a/tests/test_chat.py
+++ b/tests/test_chat.py
@@ -27,10 +27,14 @@ class TestChat:
         assert len(messages) > 0
         assert type(messages) == list
         assert type(messages[0]) == dict
-        assert type(messages[0]['content']) == str
-        assert type(messages[0]['author']) == str
-        assert type(messages[0]['timestamp']) == str
-        assert type(messages[0]['id']) == int
+        assert b'content' in messages[0]
+        assert b'author' in messages[0]
+        assert b'timestamp' in messages[0]
+        assert b'id' in messages[0]
+        assert type(messages[0][b"content"]) == bytes
+        assert type(messages[0][b"author"]) == bytes
+        assert type(messages[0][b"timestamp"]) == bytes
+        assert messages[0][b"id"].isdigit()
 
     def test_convertToMessage(self, chat):
         message = chat.convertToMessage('test', 'test', 'test', 0)