diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
index 0fb55e5dfa47c05b673f9147d5ea23549f7f671d..e57382b4d2591ce1d3ac5063a64bf0172e3753a5 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test1_StartActivityOneTest.java
@@ -6,12 +6,11 @@ import com.robotium.solo.Solo;
 
 import course.labs.activitylab.ActivityOne;
 
+@SuppressWarnings("ALL")
 public class Test1_StartActivityOneTest extends
 		ActivityInstrumentationTestCase2<ActivityOne> {
 
 	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
 
 	public Test1_StartActivityOneTest() {
 		super(ActivityOne.class);
@@ -30,6 +29,7 @@ public class Test1_StartActivityOneTest extends
 
 		// ==================== Section One =====================
 		// Wait for activity: 'course.labs.activitylab.ActivityOne'
+		int timeout = 20000;
 		assertTrue("StartActivityOneTest failed: " + "Section One:"
 				+ "ActivityOne did not correctly load", solo.waitForActivity(
 				course.labs.activitylab.ActivityOne.class, timeout));
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
index 2c6dfb81cd56d9705997af0b297e2a18824a9134..bfaecc8f3be0140057d98279f7d082ddf10c4c1e 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivityOneTest.java
@@ -6,12 +6,11 @@ import com.robotium.solo.Solo;
 
 import course.labs.activitylab.ActivityOne;
 
+@SuppressWarnings("ALL")
 public class Test2_DoubleRotateActivityOneTest extends
 		ActivityInstrumentationTestCase2<ActivityOne> {
 	
 	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
 
 	public Test2_DoubleRotateActivityOneTest() {
 		super(ActivityOne.class);
@@ -28,12 +27,14 @@ public class Test2_DoubleRotateActivityOneTest extends
 	public void testRun() {
 		// ==================== Section One =====================
 		// Wait for activity: 'course.labs.activitylab.ActivityOne'
+		int timeout = 20000;
 		assertTrue("DoubleRotateActivityOneTest failed: " +
 				   "Section One:" +
 				   "ActivityOne did not correctly load",
 				   solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-			
-		
+
+
+		int sleep = 1000;
 		solo.sleep(sleep);
 		
 		// ==================== Section Two =====================
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
deleted file mode 100644
index 6f7ba270f13ac82f76f33e86086e334496188245..0000000000000000000000000000000000000000
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test2_DoubleRotateActivtyOneTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package course.labs.activitylab.tests;
-
-import android.test.ActivityInstrumentationTestCase2;
-
-import com.robotium.solo.Solo;
-
-import course.labs.activitylab.ActivityOne;
-
-public class Test2_DoubleRotateActivtyOneTest extends
-		ActivityInstrumentationTestCase2<ActivityOne> {
-	
-	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
-
-	public Test2_DoubleRotateActivtyOneTest() {
-		super(ActivityOne.class);
-	}
-
-	public void setUp() throws Exception {
-		solo = new Solo(getInstrumentation(), getActivity());
-	}
-
-	protected void tearDown() throws Exception {
-		solo.finishOpenedActivities();
-	}
-	
-	public void testRun() {
-		// ==================== Section One =====================
-		// Wait for activity: 'course.labs.activitylab.ActivityOne'
-		assertTrue("DoubleRotateActivityOneTest failed: " +
-				   "Section One:" +
-				   "ActivityOne did not correctly load",
-				   solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-			
-		
-		solo.sleep(sleep);
-		
-		// ==================== Section Two =====================
-		// Rotate the screen
-		solo.setActivityOrientation(Solo.LANDSCAPE);
-
-		// Wait for activity: 'course.labs.activitylab.ActivityOne'
-		assertTrue("DoubleRotateActivityOneTest failed:" +
-				   "Section Two:" +
-				   "ActivityOne did not correctly load after first LANDSCAPE rotation.",
-				solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-		
-		
-		solo.sleep(sleep);
-		
-		// ==================== Section Three =====================
-		// Rotate the screen
-		solo.setActivityOrientation(Solo.PORTRAIT);
-
-		// Wait for activity: 'course.labs.activitylab.ActivityOne'
-		assertTrue("DoubleRotateActivityOneTest failed:" +
-				   "Section Three:" +
-				   "ActivityOne did not correctly load after second PORTRAIT rotation.",
-				   solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
-				
-		solo.sleep(sleep);
-		
-		// Check for proper counts
-		assertTrue("DoubleRotateActivityOneTest failed:" +
-				   "Section Three:" +
-				   "onCreate() count was off for ActivityOne after second PORTRAIT rotation.",
-				   solo.searchText("onCreate\\(\\) calls: 3"));
-		assertTrue("DoubleRotateActivityOneTest failed:" +
-				   "Section Three:" +
-				   "onStart() count was off for ActivityOne after second PORTRAIT rotation.",
-				   solo.searchText("onStart\\(\\) calls: 3"));
-		assertTrue("DoubleRotateActivityOneTest failed:" +
-				   "Section Three:" +
-				   "onResume() count was off for ActivityOne after second PORTRAIT rotation.",
-				   solo.searchText("onResume\\(\\) calls: 3"));
-		assertTrue("DoubleRotateActivityOneTest failed:" +
-				   "Section Three:" +
-				   "onRestart() count was off for ActivityOne after second PORTRAIT rotation.",
-				   solo.searchText("onRestart\\(\\) calls: 0"));
-	}
-	
-}
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
index c635a530817da3d5cef565ba63b7c57de290b0c8..a614ec9f95d7041ed3e11b504f68cf38cd3221e4 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test3_StartActivityTwoTest.java
@@ -6,11 +6,10 @@ import com.robotium.solo.Solo;
 
 import course.labs.activitylab.ActivityOne;
 
+@SuppressWarnings("ALL")
 public class Test3_StartActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
 	
 	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
 
 	public Test3_StartActivityTwoTest() {
 		super(ActivityOne.class);
@@ -29,7 +28,8 @@ public class Test3_StartActivityTwoTest extends ActivityInstrumentationTestCase2
 		
 		// ==================== Section One =====================
 		// Wait for activity: 'course.labs.activitylab.ActivityOne'
-		assertTrue("StartActivityTwoTest failed:" +
+        int timeout = 20000;
+        assertTrue("StartActivityTwoTest failed:" +
 				   "Section One:" +
 				   "ActivityOne did not load correctly",
 				   solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
index 2de3b2662221734047f298f15b4dbd71f4c66811..186b6a36a4bdc963013d016b03c79af2ea8453eb 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test4_DoubleRotateActivityTwoTest.java
@@ -2,16 +2,14 @@ package course.labs.activitylab.tests;
 
 import android.test.ActivityInstrumentationTestCase2;
 
-import com.robotium.solo.Condition;
 import com.robotium.solo.Solo;
 
 import course.labs.activitylab.ActivityOne;
 
+@SuppressWarnings("ALL")
 public class Test4_DoubleRotateActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
 
 	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
 
 	public Test4_DoubleRotateActivityTwoTest() {
 		super(ActivityOne.class);
@@ -25,10 +23,11 @@ public class Test4_DoubleRotateActivityTwoTest extends ActivityInstrumentationTe
 		solo.finishOpenedActivities();
 	}
 	
-	// Exectues the DoubleRotateActivityTwoTest
+	// Executes the DoubleRotateActivityTwoTest
 	public void testRun() {
 		// ==================== Section One =====================
 		// Wait for activity: 'course.labs.activitylab.ActivityOne'
+		int timeout = 20000;
 		assertTrue("DoubleRotateActivityTwoTest failed:" +
 				   "Section One:" +
 				   "ActivityOne did not load correctly",
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
index 1753db58e776932aec3e9598ac5f48afd03b5c39..543e4c6414fbb121984e26aff8d5f8f06409598c 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test5_CloseActivityTwoTest.java
@@ -6,12 +6,11 @@ import com.robotium.solo.Solo;
 
 import course.labs.activitylab.ActivityOne;
 
+@SuppressWarnings("ALL")
 public class Test5_CloseActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
 	
 	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
-	
+
 	public Test5_CloseActivityTwoTest() {
 		super(ActivityOne.class);
 	}
@@ -29,7 +28,8 @@ public class Test5_CloseActivityTwoTest extends ActivityInstrumentationTestCase2
 		
 		// ==================== Section One =====================
 		// Wait for activity: 'course.labs.activitylab.ActivityOne'
-		assertTrue("CloseActivityTwoTest failed:" +
+        int timeout = 20000;
+        assertTrue("CloseActivityTwoTest failed:" +
 				   "Section One:" +
 				   "ActivityOne did not load correctly",
 				   solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
@@ -51,7 +51,8 @@ public class Test5_CloseActivityTwoTest extends ActivityInstrumentationTestCase2
 		// Click on Close Activity
 		
 		solo.waitForView(course.labs.activitylab.R.id.bClose);
-		
+
+		int sleep = 1000;
 		solo.sleep(sleep);
 		
 		solo.clickOnView(solo.getView(course.labs.activitylab.R.id.bClose));
diff --git a/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java b/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
index dd3cef8246d1046a25dbde7f7e3d5168baf7f27f..e4feea0a3bde7f889e6a9f07d9bc2fc62667a0a2 100644
--- a/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
+++ b/app/src/androidTest/java/course/labs/activitylab/tests/Test6_ReopenActivityTwoTest.java
@@ -6,11 +6,10 @@ import com.robotium.solo.Solo;
 
 import course.labs.activitylab.ActivityOne;
 
+@SuppressWarnings("ALL")
 public class Test6_ReopenActivityTwoTest extends ActivityInstrumentationTestCase2<ActivityOne> {
 	
 	private Solo solo;
-	private int timeout = 20000;
-	private int sleep = 1000;
 
 	public Test6_ReopenActivityTwoTest() {
 		super(ActivityOne.class);
@@ -29,7 +28,8 @@ public class Test6_ReopenActivityTwoTest extends ActivityInstrumentationTestCase
 		
 		// ==================== Section One =====================
 		// Wait for activity: 'course.labs.activitylab.ActivityOne'
-		assertTrue("ReopenActivityTwoTest failed:" +
+        int timeout = 20000;
+        assertTrue("ReopenActivityTwoTest failed:" +
 				   "Section One:" +
 				   "ActivityOne did not load correctly",
 				   solo.waitForActivity(course.labs.activitylab.ActivityOne.class, timeout));
@@ -47,7 +47,8 @@ public class Test6_ReopenActivityTwoTest extends ActivityInstrumentationTestCase
 				   solo.waitForActivity(course.labs.activitylab.ActivityTwo.class, timeout));
 		
 		solo.waitForView(course.labs.activitylab.R.id.bClose);
-		
+
+		int sleep = 1000;
 		solo.sleep(sleep);
 		
 		// ==================== Section Three =====================