diff --git a/bin/cards/Suit.class b/bin/cards/Suit.class
index fc3210e..dbd0534 100644
Binary files a/bin/cards/Suit.class and b/bin/cards/Suit.class differ
diff --git a/bin/cards/maumau/model/CardHandler.class b/bin/cards/maumau/model/CardHandler.class
index eb9a422..c9c335c 100644
Binary files a/bin/cards/maumau/model/CardHandler.class and b/bin/cards/maumau/model/CardHandler.class differ
diff --git a/bin/test/cards/CardTest.class b/bin/test/cards/CardTest.class
new file mode 100644
index 0000000..74e5d45
Binary files /dev/null and b/bin/test/cards/CardTest.class differ
diff --git a/bin/test/cards/RankTest.class b/bin/test/cards/RankTest.class
new file mode 100644
index 0000000..33ddd32
Binary files /dev/null and b/bin/test/cards/RankTest.class differ
diff --git a/bin/test/cards/SuitTest.class b/bin/test/cards/SuitTest.class
new file mode 100644
index 0000000..260545a
Binary files /dev/null and b/bin/test/cards/SuitTest.class differ
diff --git a/bin/test/cards/maumau/MauMauDeckTest.class b/bin/test/cards/maumau/MauMauDeckTest.class
new file mode 100644
index 0000000..a4de605
Binary files /dev/null and b/bin/test/cards/maumau/MauMauDeckTest.class differ
diff --git a/bin/test/cards/maumau/model/CardHandlerTest.class b/bin/test/cards/maumau/model/CardHandlerTest.class
new file mode 100644
index 0000000..0115370
Binary files /dev/null and b/bin/test/cards/maumau/model/CardHandlerTest.class differ
diff --git a/bin/test/cards/maumau/model/MauMau1Test.class b/bin/test/cards/maumau/model/MauMau1Test.class
new file mode 100644
index 0000000..9e78f1b
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau1Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau2Test.class b/bin/test/cards/maumau/model/MauMau2Test.class
new file mode 100644
index 0000000..6900e05
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau2Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau3Test.class b/bin/test/cards/maumau/model/MauMau3Test.class
new file mode 100644
index 0000000..6476aaa
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau3Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau4Test.class b/bin/test/cards/maumau/model/MauMau4Test.class
new file mode 100644
index 0000000..7e2a885
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau4Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau5Test.class b/bin/test/cards/maumau/model/MauMau5Test.class
new file mode 100644
index 0000000..34ed3df
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau5Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau6Test.class b/bin/test/cards/maumau/model/MauMau6Test.class
new file mode 100644
index 0000000..f6c12ee
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau6Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau7Test.class b/bin/test/cards/maumau/model/MauMau7Test.class
new file mode 100644
index 0000000..16cbe55
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau7Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau8Test.class b/bin/test/cards/maumau/model/MauMau8Test.class
new file mode 100644
index 0000000..47c401e
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau8Test.class differ
diff --git a/bin/test/cards/maumau/model/MauMau9Test.class b/bin/test/cards/maumau/model/MauMau9Test.class
new file mode 100644
index 0000000..669d0e2
Binary files /dev/null and b/bin/test/cards/maumau/model/MauMau9Test.class differ
diff --git a/src/cards/Suit.java b/src/cards/Suit.java
index 2341a59..028e37f 100644
--- a/src/cards/Suit.java
+++ b/src/cards/Suit.java
@@ -30,16 +30,16 @@ public enum Suit {
     public String toString() {
         switch (this) {
             case HEARTS:
-                return "♥";
+                return "♥︎";
             
             case DIAMONDS:
-                return "♦";
+                return "♦︎";
 
             case CLUBS:
-                return "♣";
+                return "♣︎";
 
             case SPADES:
-                return "♠";
+                return "♠︎";
         
             default:
                 return "";
diff --git a/src/cards/maumau/model/CardHandler.java b/src/cards/maumau/model/CardHandler.java
index 194ea3f..57ba669 100644
--- a/src/cards/maumau/model/CardHandler.java
+++ b/src/cards/maumau/model/CardHandler.java
@@ -73,7 +73,7 @@ public class CardHandler {
      * Deals cards to all players.
      * @throws Exception when there are not enough cards to satisfy starting conditions
      */
-    void dealCards() throws Exception {
+    public void dealCards() throws Exception {
 
         // get List of players
         List<Player> players = game.getPlayers();
@@ -119,7 +119,7 @@ public class CardHandler {
      *
      * @return The top card of the discard pile.
      */
-    Card top() {
+    public Card top() {
         return discardPile.getFirst();
     }
 }
diff --git a/test/cards/CardTest.java b/src/test/cards/CardTest.java
similarity index 90%
rename from test/cards/CardTest.java
rename to src/test/cards/CardTest.java
index f8ffc00..e252d6e 100644
--- a/test/cards/CardTest.java
+++ b/src/test/cards/CardTest.java
@@ -1,7 +1,11 @@
-package cards;
+package test.cards;
 
 import org.junit.Test;
 
+import cards.Card;
+import cards.Rank;
+import cards.Suit;
+
 import static cards.Rank.THREE;
 import static cards.Rank.TWO;
 import static cards.Suit.HEARTS;
diff --git a/test/cards/RankTest.java b/src/test/cards/RankTest.java
similarity index 98%
rename from test/cards/RankTest.java
rename to src/test/cards/RankTest.java
index b2c7e24..a92b816 100644
--- a/test/cards/RankTest.java
+++ b/src/test/cards/RankTest.java
@@ -1,4 +1,4 @@
-package cards;
+package test.cards;
 
 import org.junit.Test;
 
diff --git a/test/cards/SuitTest.java b/src/test/cards/SuitTest.java
similarity index 96%
rename from test/cards/SuitTest.java
rename to src/test/cards/SuitTest.java
index 1020272..a4f6ea9 100644
--- a/test/cards/SuitTest.java
+++ b/src/test/cards/SuitTest.java
@@ -1,4 +1,4 @@
-package cards;
+package test.cards;
 
 import org.junit.Test;
 
diff --git a/test/cards/maumau/MauMauDeckTest.java b/src/test/cards/maumau/MauMauDeckTest.java
similarity index 94%
rename from test/cards/maumau/MauMauDeckTest.java
rename to src/test/cards/maumau/MauMauDeckTest.java
index e6e1665..74f3206 100644
--- a/test/cards/maumau/MauMauDeckTest.java
+++ b/src/test/cards/maumau/MauMauDeckTest.java
@@ -1,8 +1,10 @@
-package cards.maumau;
+package test.cards.maumau;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.MauMauDeck;
+
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/CardHandlerTest.java b/src/test/cards/maumau/model/CardHandlerTest.java
similarity index 86%
rename from test/cards/maumau/model/CardHandlerTest.java
rename to src/test/cards/maumau/model/CardHandlerTest.java
index e9c74ca..d7e35f9 100644
--- a/test/cards/maumau/model/CardHandlerTest.java
+++ b/src/test/cards/maumau/model/CardHandlerTest.java
@@ -1,8 +1,11 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
+
 import org.junit.Test;
 
 import java.util.List;
@@ -35,7 +38,12 @@ public class CardHandlerTest {
         final Player chantal = game.addPlayer("Chantal");
         assertTrue(jacqueline.getCards().isEmpty());
         assertTrue(chantal.getCards().isEmpty());
-        game.getCardHandler().dealCards();
+        try {
+            game.getCardHandler().dealCards();
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
         assertEquals("[J♦︎, Q♦︎, A♠︎, A♦︎, 8♦︎]", jacqueline.getCards().toString());
         assertEquals("[7♣︎, 9♣︎, 9♠︎, 8♣︎, K♥︎]", chantal.getCards().toString());
         assertEquals(c(ACE, HEARTS), game.getCardHandler().top());
diff --git a/test/cards/maumau/model/MauMau1Test.java b/src/test/cards/maumau/model/MauMau1Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau1Test.java
rename to src/test/cards/maumau/model/MauMau1Test.java
index 52ba495..10ae63e 100644
--- a/test/cards/maumau/model/MauMau1Test.java
+++ b/src/test/cards/maumau/model/MauMau1Test.java
@@ -1,8 +1,11 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
+
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau2Test.java b/src/test/cards/maumau/model/MauMau2Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau2Test.java
rename to src/test/cards/maumau/model/MauMau2Test.java
index 29aafc0..f62fe2a 100644
--- a/test/cards/maumau/model/MauMau2Test.java
+++ b/src/test/cards/maumau/model/MauMau2Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau3Test.java b/src/test/cards/maumau/model/MauMau3Test.java
similarity index 98%
rename from test/cards/maumau/model/MauMau3Test.java
rename to src/test/cards/maumau/model/MauMau3Test.java
index 612bcfd..9f124d0 100644
--- a/test/cards/maumau/model/MauMau3Test.java
+++ b/src/test/cards/maumau/model/MauMau3Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau4Test.java b/src/test/cards/maumau/model/MauMau4Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau4Test.java
rename to src/test/cards/maumau/model/MauMau4Test.java
index aedd9cb..54a10af 100644
--- a/test/cards/maumau/model/MauMau4Test.java
+++ b/src/test/cards/maumau/model/MauMau4Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau5Test.java b/src/test/cards/maumau/model/MauMau5Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau5Test.java
rename to src/test/cards/maumau/model/MauMau5Test.java
index 2b56c42..b24be78 100644
--- a/test/cards/maumau/model/MauMau5Test.java
+++ b/src/test/cards/maumau/model/MauMau5Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau6Test.java b/src/test/cards/maumau/model/MauMau6Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau6Test.java
rename to src/test/cards/maumau/model/MauMau6Test.java
index 9797741..2c9a9dd 100644
--- a/test/cards/maumau/model/MauMau6Test.java
+++ b/src/test/cards/maumau/model/MauMau6Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau7Test.java b/src/test/cards/maumau/model/MauMau7Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau7Test.java
rename to src/test/cards/maumau/model/MauMau7Test.java
index ccd90d5..2c2c66b 100644
--- a/test/cards/maumau/model/MauMau7Test.java
+++ b/src/test/cards/maumau/model/MauMau7Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau8Test.java b/src/test/cards/maumau/model/MauMau8Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau8Test.java
rename to src/test/cards/maumau/model/MauMau8Test.java
index 533d385..24014d2 100644
--- a/test/cards/maumau/model/MauMau8Test.java
+++ b/src/test/cards/maumau/model/MauMau8Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;
diff --git a/test/cards/maumau/model/MauMau9Test.java b/src/test/cards/maumau/model/MauMau9Test.java
similarity index 99%
rename from test/cards/maumau/model/MauMau9Test.java
rename to src/test/cards/maumau/model/MauMau9Test.java
index 0de4807..384c406 100644
--- a/test/cards/maumau/model/MauMau9Test.java
+++ b/src/test/cards/maumau/model/MauMau9Test.java
@@ -1,8 +1,10 @@
-package cards.maumau.model;
+package test.cards.maumau.model;
 
 import cards.Card;
 import cards.Rank;
 import cards.Suit;
+import cards.maumau.model.MauMau;
+import cards.maumau.model.Player;
 import org.junit.Test;
 
 import java.util.List;