diff --git a/test/jrummikub/model/HandTest.java b/test/jrummikub/model/HandTest.java
index 88ef463..f0be046 100644
--- a/test/jrummikub/model/HandTest.java
+++ b/test/jrummikub/model/HandTest.java
@@ -20,11 +20,13 @@ import org.junit.Test;
 public class HandTest {
 
 	IHand hand;
+	GameSettings settings;
 
 	/** */
 	@Before
 	public void setUp() {
 		hand = new Hand();
+		settings = new GameSettings();
 	}
 
 	/** */
@@ -141,7 +143,7 @@ public class HandTest {
 
 	private void testInitialMeld(boolean possible, List<Stone> handStones) {
 		dropStoneList(handStones);
-		assertTrue(possible == hand.isInitialMeldPossible(new GameSettings()));
+		assertTrue(possible == hand.isInitialMeldPossible(settings));
 	}
 
 	/** */
@@ -244,6 +246,16 @@ public class HandTest {
 				new Stone(11, BLUE), new Stone(RED)));
 	}
 
+	/** */
+	@Test
+	public void testNoLimits() {
+		testInitialMeld(false, Arrays.asList(new Stone(12, RED), new Stone(13,
+				RED), new Stone(1, RED), new Stone(2, RED), new Stone(3, RED)));
+		settings.setNoLimits(true);
+		testInitialMeld(true, Arrays.asList(new Stone(12, RED), new Stone(13,
+				RED), new Stone(1, RED), new Stone(2, RED), new Stone(3, RED)));
+	}
+
 	/** */
 	@Test
 	public void testCountIdenticalStones() {
@@ -266,4 +278,5 @@ public class HandTest {
 		assertEquals(0, hand.getIdenticalStoneCount());
 
 	}
+
 }