diff --git a/src/MockGuiTests.java b/src/MockGuiTests.java
deleted file mode 100644
index 7cfd54f..0000000
--- a/src/MockGuiTests.java
+++ /dev/null
@@ -1,14 +0,0 @@
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import junit.framework.TestCase;
-
-public class MockGuiTests extends TestCase{
-
-	@Test
-	public void test() {
-		
-		assertEquals(1,1);
-	}
-
-}
diff --git a/src/tests/MockGuiTests.java b/src/tests/MockGuiTests.java
new file mode 100644
index 0000000..83586d7
--- /dev/null
+++ b/src/tests/MockGuiTests.java
@@ -0,0 +1,70 @@
+package tests;
+
+import static org.junit.Assert.*;
+import MockGui;
+
+import java.awt.Color;
+
+import org.junit.Test;
+
+import junit.framework.TestCase;
+
+public class MockGuiTests extends TestCase{
+
+	MockGui mg;
+	public void setUp(){
+		int[][] nodes;
+		int NUM = 6;
+		nodes = new int[NUM][2];
+		nodes[0][0] = 1; 
+		nodes[0][1] = 3;
+		nodes[1][0] = 16;
+		nodes[1][1] = 3;
+		nodes[2][0] = 16;
+		nodes[2][1] = 9;
+		nodes[3][0] = 4;
+		nodes[3][1] = 9;
+		nodes[4][0] = 4;
+		nodes[4][1] = 15;
+		nodes[5][0] = 18;
+		nodes[5][1] = 15;		
+		mg = new  MockGui(640, 640, 32, NUM, nodes);
+	}
+	
+	@Test
+	public void testHashX() {
+		int ans[] = mg.hash(20, 10);
+
+		assertEquals(ans[0],640);
+		//assertEquals(ans[1],320);
+	}
+	
+	@Test
+	public void testHashY(){
+		int ans[] = mg.hash(20, 10);
+		assertEquals(ans[1],320);
+	}
+	
+	@Test
+	public void testUnhashX() {
+		int ans[] = mg.unhash(96, 10);
+		assertEquals(ans[0],3);
+	}
+	
+	@Test
+	public void testUnhashY() {
+		int ans[] = mg.unhash(96, 128);
+		assertEquals(ans[1],4);
+	}
+	
+	public void testColor(){
+		mg.setBackground(Color.BLACK);
+		Color aColor = mg.getBackground();
+		assertEquals(aColor, Color.BLACK);
+	}
+	
+	public void testTowerSetup(){
+		
+	}
+
+}