diff --git a/GraffitiLib/build.gradle b/GraffitiLib/build.gradle
index 97f38e67db5f8001406b57fb702abaab6da45422..5edba0300c34ed4778b3f8ba7e799f91064b3912 100644
--- a/GraffitiLib/build.gradle
+++ b/GraffitiLib/build.gradle
@@ -22,7 +22,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
     compile 'com.android.support:support-v4:23.0.1'
     compile project(':AndroidsLib-release')
 }
diff --git a/GraffitiLib/src/androidTest/java/cn/hzw/graffiti/ApplicationTest.java b/GraffitiLib/src/androidTest/java/cn/hzw/graffiti/ApplicationTest.java
deleted file mode 100644
index 5c0a39443bac07792d7b820d4b137f6ae651d9a8..0000000000000000000000000000000000000000
--- a/GraffitiLib/src/androidTest/java/cn/hzw/graffiti/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.hzw.graffiti;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/GraffitiLib/src/test/java/cn/hzw/graffiti/ExampleUnitTest.java b/GraffitiLib/src/test/java/cn/hzw/graffiti/ExampleUnitTest.java
deleted file mode 100644
index a5752c00d28ff9215c01993920bb061691d2e2d1..0000000000000000000000000000000000000000
--- a/GraffitiLib/src/test/java/cn/hzw/graffiti/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.hzw.graffiti;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/ImageSelector/build.gradle b/ImageSelector/build.gradle
index f211e992deae1fe831ab19da46042dbdead2083b..27ebc77d3faf45fd0f6ffeeab7dcd9409af208aa 100644
--- a/ImageSelector/build.gradle
+++ b/ImageSelector/build.gradle
@@ -20,7 +20,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
     compile files('libs/xUtils-2.6.14.jar')
     compile project(':AndroidsLib-release')
 }
diff --git a/ImageSelector/src/androidTest/java/cn/hzw/imageselector/ApplicationTest.java b/ImageSelector/src/androidTest/java/cn/hzw/imageselector/ApplicationTest.java
deleted file mode 100644
index d58a885554333b1f0e249e144483a81dc0be81ce..0000000000000000000000000000000000000000
--- a/ImageSelector/src/androidTest/java/cn/hzw/imageselector/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.hzw.imageselector;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/ImageSelector/src/test/java/cn/hzw/imageselector/ExampleUnitTest.java b/ImageSelector/src/test/java/cn/hzw/imageselector/ExampleUnitTest.java
deleted file mode 100644
index 33314e7ea7a39186808bb6d336d3e875c7233a10..0000000000000000000000000000000000000000
--- a/ImageSelector/src/test/java/cn/hzw/imageselector/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.hzw.imageselector;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index f3e144204d5b92bc39e896dad903a392ae7f0c56..ae900072117c9008852043df365b518ffab2fcc2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,6 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
     compile project(':GraffitiLib')
     compile project(':ImageSelector')
 }
diff --git a/app/src/androidTest/java/cn/hzw/graffitidemo/ApplicationTest.java b/app/src/androidTest/java/cn/hzw/graffitidemo/ApplicationTest.java
deleted file mode 100644
index 0bbc8d117927658d1ae1fc00bb2d4bb4ae4dd031..0000000000000000000000000000000000000000
--- a/app/src/androidTest/java/cn/hzw/graffitidemo/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package cn.hzw.graffitidemo;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9e75f49c15ed98a9cb8b0a24c1183e42d27605bd..6121e5b4f3f54e2773ff72e65bddcbb5f06e9696 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,8 +4,8 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/graffiti_imageselector_app_name"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
         android:theme="@android:style/Theme.NoTitleBar"
         >
         <activity android:name=".MainActivity">
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png
similarity index 100%
rename from app/src/main/res/mipmap-hdpi/ic_launcher.png
rename to app/src/main/res/drawable/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index c133a0cbd379f5af6dbf1a899a0293ca5eccfad0..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index aee44e138434630332d88b1680f33c4b24c70ab3..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/app/src/test/java/cn/hzw/graffitidemo/ExampleUnitTest.java b/app/src/test/java/cn/hzw/graffitidemo/ExampleUnitTest.java
deleted file mode 100644
index 684718753b94883061d8a3d85197be53a387e1f4..0000000000000000000000000000000000000000
--- a/app/src/test/java/cn/hzw/graffitidemo/ExampleUnitTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cn.hzw.graffitidemo;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * To work on unit tests, switch the Test Artifact in the Build Variants view.
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file
diff --git a/build/generated/mockable-android-23.jar b/build/generated/mockable-android-23.jar
index bffad616973e13181a1dcacf37b24f080a2b38ab..7f6e8f33a3e9477fc73193023d100d935b2a263d 100644
Binary files a/build/generated/mockable-android-23.jar and b/build/generated/mockable-android-23.jar differ