diff --git a/app-messaging-fcm/build.gradle b/app-messaging-fcm/build.gradle
index 1277ac985..aff32de13 100644
--- a/app-messaging-fcm/build.gradle
+++ b/app-messaging-fcm/build.gradle
@@ -13,7 +13,7 @@ android {
     defaultConfig {
         applicationId "ly.count.android.demo.messaging_fcm"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 26
         versionCode 1
         versionName "1.0"
 
diff --git a/app/build.gradle b/app/build.gradle
index 0b2ab2eb5..90a6be5d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -48,8 +48,6 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':sdk')
 
-    implementation 'junit:junit:4.12'
-
     //implementation 'com.google.android.gms:play-services-gcm:10.0.1'
 
     //implementation 'ly.count.android:sdk:19.02.1'
diff --git a/app/src/main/java/ly/count/android/demo/ActivityExampleCrashReporting.java b/app/src/main/java/ly/count/android/demo/ActivityExampleCrashReporting.java
index 7163cd619..dc41c900a 100644
--- a/app/src/main/java/ly/count/android/demo/ActivityExampleCrashReporting.java
+++ b/app/src/main/java/ly/count/android/demo/ActivityExampleCrashReporting.java
@@ -4,8 +4,6 @@
 import android.os.Bundle;
 import android.view.View;
 
-import junit.framework.Assert;
-
 import ly.count.android.sdk.Countly;
 
 @SuppressWarnings("UnusedParameters")
@@ -56,7 +54,7 @@ public void onClickCrashReporting04(View v) {
 
     public void onClickCrashReporting05(View v) {
         Countly.sharedInstance().addCrashBreadcrumb("Assert fail crash");
-        Assert.assertEquals(1, 0);
+        //Assert.assertEquals(1, 0);
     }
 
     public void onClickCrashReporting06(View v) {
diff --git a/app/src/main/res/layout/activity_example_crash_reporting.xml b/app/src/main/res/layout/activity_example_crash_reporting.xml
index b81ba7390..489a9c3fa 100644
--- a/app/src/main/res/layout/activity_example_crash_reporting.xml
+++ b/app/src/main/res/layout/activity_example_crash_reporting.xml
@@ -42,11 +42,12 @@
         android:onClick="onClickCrashReporting04"/>
 
     <Button
-        android:text="@string/assert_fail"
+        android:id="@+id/button24"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/button24"
-        android:onClick="onClickCrashReporting05"/>
+        android:enabled="false"
+        android:onClick="onClickCrashReporting05"
+        android:text="@string/assert_fail" />
 
     <Button
         android:text="@string/kill"
diff --git a/sdk-messaging-fcm/build.gradle b/sdk-messaging-fcm/build.gradle
index 9fa705501..e1d921b18 100644
--- a/sdk-messaging-fcm/build.gradle
+++ b/sdk-messaging-fcm/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath 'com.novoda:bintray-release:0.9'
     }
 }
 
diff --git a/sdk-messaging/build.gradle b/sdk-messaging/build.gradle
index 00ccc9f5e..07481302f 100644
--- a/sdk-messaging/build.gradle
+++ b/sdk-messaging/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath 'com.novoda:bintray-release:0.9'
     }
 }
 
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java
index 32cc8d5b6..7605db1a2 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionProcessorTests.java
@@ -47,7 +47,7 @@ public class ConnectionProcessorTests {
     String testDeviceId;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         mockStore = mock(CountlyStore.class);
         mockDeviceId = mock(DeviceId.class);
         connectionProcessor = new ConnectionProcessor("http://server", mockStore, mockDeviceId, null, null);
@@ -105,7 +105,7 @@ private static class TestInputStream extends InputStream {
         boolean closed = false;
 
         @Override
-        public int read() throws IOException {
+        public int read() {
             return readCount++ < 1 ? 1 : -1;
         }
 
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java
index 901d3325b..6c896e1a1 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/ConnectionQueueTests.java
@@ -54,7 +54,7 @@ public class ConnectionQueueTests {
     final static long timestampAllowance = 150;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         freshConnQ = new ConnectionQueue();
         connQ = new ConnectionQueue();
         connQ.setAppKey("abcDeFgHiJkLmNoPQRstuVWxyz");
@@ -386,7 +386,7 @@ private Map<String, String> parseQueryParams(final String queryStr) {
         final String urlStr = "http://server?" + queryStr;
         final Uri uri = Uri.parse(urlStr);
         final Set<String> queryParameterNames = uri.getQueryParameterNames();
-        final Map<String, String> queryParams = new HashMap<String, String>(queryParameterNames.size());
+        final Map<String, String> queryParams = new HashMap<>(queryParameterNames.size());
         for (String paramName : queryParameterNames) {
             queryParams.put(paramName, uri.getQueryParameter(paramName));
         }
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/CountlyStoreTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/CountlyStoreTests.java
index a5ac4c19c..85c979da8 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/CountlyStoreTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/CountlyStoreTests.java
@@ -48,13 +48,13 @@ public class CountlyStoreTests {
     CountlyStore store;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         store = new CountlyStore(getContext());
         store.clear();
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
         store.clear();
     }
 
@@ -157,7 +157,7 @@ public void testEventsList_singleEvent() {
         event1.count = 1;
         event1.dur = 10.0d;
         store.addEvent(event1.key, event1.segmentation, null, null, event1.timestamp, event1.hour, event1.dow, event1.count, event1.sum, event1.dur);
-        final List<Event> expected = new ArrayList<Event>(1);
+        final List<Event> expected = new ArrayList<>(1);
         expected.add(event1);
         final List<Event> actual = store.eventsList();
         assertEquals(expected, actual);
@@ -183,7 +183,7 @@ public void testEventsList_sortingOfMultipleEvents() {
         store.addEvent(event1.key, event1.segmentation, null, null, event1.timestamp, event1.hour, event1.dow, event1.count, event1.sum, event1.dur);
         store.addEvent(event2.key, event2.segmentation, null, null, event2.timestamp, event2.hour, event2.dow, event2.count, event2.sum, event2.dur);
         store.addEvent(event3.key, event3.segmentation, null, null, event3.timestamp, event3.hour, event3.dow, event3.count, event3.sum, event3.dur);
-        final List<Event> expected = new ArrayList<Event>(3);
+        final List<Event> expected = new ArrayList<>(3);
         expected.add(event2);
         expected.add(event3);
         expected.add(event1);
@@ -210,7 +210,7 @@ public void testEventsList_badJSON() {
         final SharedPreferences prefs = getContext().getSharedPreferences("COUNTLY_STORE", Context.MODE_PRIVATE);
         prefs.edit().putString("EVENTS", joinedEventsWithBadJSON).commit();
 
-        final List<Event> expected = new ArrayList<Event>(2);
+        final List<Event> expected = new ArrayList<>(2);
         expected.add(event1);
         expected.add(event2);
         final List<Event> actual = store.eventsList();
@@ -236,7 +236,7 @@ public void testEventsList_EventFromJSONReturnsNull() {
         final SharedPreferences prefs = getContext().getSharedPreferences("COUNTLY_STORE", Context.MODE_PRIVATE);
         prefs.edit().putString("EVENTS", joinedEventsWithBadJSON).commit();
 
-        final List<Event> expected = new ArrayList<Event>(2);
+        final List<Event> expected = new ArrayList<>(2);
         expected.add(event1);
         expected.add(event2);
         final List<Event> actual = store.eventsList();
@@ -326,7 +326,7 @@ public void testAddEvent() {
         event1.count = 42;
         event1.sum = 3.2;
         event1.dur = 10.0d;
-        event1.segmentation = new HashMap<String, String>(2);
+        event1.segmentation = new HashMap<>(2);
         event1.segmentation.put("segKey1", "segValue1");
         event1.segmentation.put("segKey2", "segValue2");
 
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/CountlyTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/CountlyTests.java
index bb17a775b..f10e4ba0d 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/CountlyTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/CountlyTests.java
@@ -46,7 +46,7 @@ public class CountlyTests {
     Countly mCountly;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
         final CountlyStore countlyStore = new CountlyStore(getContext());
         countlyStore.clear();
 
@@ -57,7 +57,7 @@ public void setUp() throws Exception {
     }
 
     @After
-    public void tearDown() throws Exception {
+    public void tearDown() {
     }
 
     @Test
@@ -465,7 +465,7 @@ public void testRecordEvent_keyAndCountAndSum() {
     public void testRecordEvent_keyAndSegmentationAndCount() {
         final String eventKey = "eventKey";
         final int count = 42;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "segvalue1");
         final Countly countly = spy(mCountly);
         doNothing().when(countly).recordEvent(eventKey, segmentation, count, 0.0d);
@@ -478,7 +478,7 @@ public void testRecordEvent_initNotCalled() {
         final String eventKey = "eventKey";
         final int count = 42;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "segvalue1");
 
         try {
@@ -494,7 +494,7 @@ public void testRecordEvent_nullKey() {
         final String eventKey = null;
         final int count = 42;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "segvalue1");
 
         try {
@@ -511,7 +511,7 @@ public void testRecordEvent_emptyKey() {
         final String eventKey = "";
         final int count = 42;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "segvalue1");
 
         try {
@@ -527,7 +527,7 @@ public void testRecordEvent_countIsZero() {
         final String eventKey = "";
         final int count = 0;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "segvalue1");
 
         try {
@@ -543,7 +543,7 @@ public void testRecordEvent_countIsNegative() {
         final String eventKey = "";
         final int count = -1;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "segvalue1");
 
         try {
@@ -559,7 +559,7 @@ public void testRecordEvent_segmentationHasNullKey() {
         final String eventKey = "";
         final int count = 1;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put(null, "segvalue1");
 
         try {
@@ -575,7 +575,7 @@ public void testRecordEvent_segmentationHasEmptyKey() {
         final String eventKey = "";
         final int count = 1;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("", "segvalue1");
 
         try {
@@ -591,7 +591,7 @@ public void testRecordEvent_segmentationHasNullValue() {
         final String eventKey = "";
         final int count = 1;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", null);
 
         try {
@@ -607,7 +607,7 @@ public void testRecordEvent_segmentationHasEmptyValue() {
         final String eventKey = "";
         final int count = 1;
         final double sum = 3.0d;
-        final HashMap<String, String> segmentation = new HashMap<String, String>(1);
+        final HashMap<String, String> segmentation = new HashMap<>(1);
         segmentation.put("segkey1", "");
 
         try {
@@ -620,6 +620,7 @@ public void testRecordEvent_segmentationHasEmptyValue() {
 
     //todo fix test, problem while mocking
     /*
+    @Test
     public void testRecordEvent() {
         final String eventKey = "eventKey";
         final int count = 42;
@@ -639,6 +640,7 @@ public void testRecordEvent() {
         verify(countly).sendEventsIfNeeded();
     }
 
+    @Test
     public void testSendEventsIfNeeded_emptyQueue() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -653,6 +655,7 @@ public void testSendEventsIfNeeded_emptyQueue() {
         verifyZeroInteractions(mockConnectionQueue);
     }
 
+    @Test
     public void testSendEventsIfNeeded_lessThanThreshold() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -667,6 +670,7 @@ public void testSendEventsIfNeeded_lessThanThreshold() {
         verifyZeroInteractions(mockConnectionQueue);
     }
 
+    @Test
     public void testSendEventsIfNeeded_equalToThreshold() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -683,6 +687,7 @@ public void testSendEventsIfNeeded_equalToThreshold() {
         verify(mockConnectionQueue, times(1)).recordEvents(eventData);
     }
 
+    @Test
     public void testSendEventsIfNeeded_moreThanThreshold() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -699,6 +704,7 @@ public void testSendEventsIfNeeded_moreThanThreshold() {
         verify(mockConnectionQueue, times(1)).recordEvents(eventData);
     }
 
+    @Test
     public void testOnTimer_noActiveSession() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -711,6 +717,7 @@ public void testOnTimer_noActiveSession() {
         verifyZeroInteractions(mockConnectionQueue, mockEventQueue);
     }
 
+    @Test
     public void testOnTimer_activeSession_emptyEventQueue() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -726,6 +733,7 @@ public void testOnTimer_activeSession_emptyEventQueue() {
         verify(mockConnectionQueue, times(0)).recordEvents(anyString());
     }
 
+    @Test
     public void testOnTimer_activeSession_nonEmptyEventQueue() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -743,6 +751,7 @@ public void testOnTimer_activeSession_nonEmptyEventQueue() {
         verify(mockConnectionQueue).recordEvents(eventData);
     }
 
+    @Test
     public void testOnTimer_activeSession_emptyEventQueue_sessionTimeUpdatesDisabled() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
@@ -759,6 +768,7 @@ public void testOnTimer_activeSession_emptyEventQueue_sessionTimeUpdatesDisabled
         verify(mockConnectionQueue, times(0)).recordEvents(anyString());
     }
 
+    @Test
     public void testOnTimer_activeSession_nonEmptyEventQueue_sessionTimeUpdatesDisabled() {
         final ConnectionQueue mockConnectionQueue = mock(ConnectionQueue.class);
         mCountly.setConnectionQueue(mockConnectionQueue);
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/EventQueueTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/EventQueueTests.java
index b6730bc6b..da891ff89 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/EventQueueTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/EventQueueTests.java
@@ -46,7 +46,7 @@ public class EventQueueTests {
     CountlyStore mMockCountlyStore;
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
 
         mMockCountlyStore = mock(CountlyStore.class);
         mEventQueue = new EventQueue(mMockCountlyStore);
@@ -63,7 +63,7 @@ public void testRecordEvent() {
         final int count = 42;
         final double sum = 3.0d;
         final double dur = 10.0d;
-        final Map<String, String> segmentation = new HashMap<String, String>(1);
+        final Map<String, String> segmentation = new HashMap<>(1);
         final Map<String, Integer> segmentationInt = null;
         final Map<String, Double> segmentationDouble = null;
         final long timestamp = Countly.currentTimestampMs();
@@ -90,7 +90,7 @@ public void testSize() {
 
     @Test
     public void testEvents_emptyList() throws UnsupportedEncodingException {
-        final List<Event> eventsList = new ArrayList<Event>();
+        final List<Event> eventsList = new ArrayList<>();
         when(mMockCountlyStore.eventsList()).thenReturn(eventsList);
 
         final String expected = URLEncoder.encode("[]", "UTF-8");
@@ -101,7 +101,7 @@ public void testEvents_emptyList() throws UnsupportedEncodingException {
 
     @Test
     public void testEvents_nonEmptyList() throws UnsupportedEncodingException {
-        final List<Event> eventsList = new ArrayList<Event>();
+        final List<Event> eventsList = new ArrayList<>();
         final Event event1 = new Event();
         event1.key = "event1Key";
         eventsList.add(event1);
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/EventTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/EventTests.java
index 9a9f73776..7d6937145 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/EventTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/EventTests.java
@@ -56,54 +56,54 @@ public void testEqualsAndHashCode() {
         final Event event2 = new Event();
         //noinspection ObjectEqualsNull
         assertFalse(event1.equals(null));
-        assertFalse(event1.equals(new Object()));
-        assertTrue(event1.equals(event2));
+        assertNotEquals(event1, new Object());
+        assertEquals(event1, event2);
         assertEquals(event1.hashCode(), event2.hashCode());
 
         event1.key = "eventKey";
-        assertFalse(event1.equals(event2));
-        assertFalse(event2.equals(event1));
+        assertNotEquals(event1, event2);
+        assertNotEquals(event2, event1);
         assertTrue(event1.hashCode() != event2.hashCode());
 
         event2.key = "eventKey";
-        assertTrue(event1.equals(event2));
-        assertTrue(event2.equals(event1));
+        assertEquals(event1, event2);
+        assertEquals(event2, event1);
         assertEquals(event1.hashCode(), event2.hashCode());
 
         event1.timestamp = 1234;
-        assertFalse(event1.equals(event2));
-        assertFalse(event2.equals(event1));
+        assertNotEquals(event1, event2);
+        assertNotEquals(event2, event1);
         assertTrue(event1.hashCode() != event2.hashCode());
 
         event2.timestamp = 1234;
-        assertTrue(event1.equals(event2));
-        assertTrue(event2.equals(event1));
+        assertEquals(event1, event2);
+        assertEquals(event2, event1);
         assertEquals(event1.hashCode(), event2.hashCode());
 
-        event1.segmentation = new HashMap<String, String>();
-        assertFalse(event1.equals(event2));
-        assertFalse(event2.equals(event1));
+        event1.segmentation = new HashMap<>();
+        assertNotEquals(event1, event2);
+        assertNotEquals(event2, event1);
         assertTrue(event1.hashCode() != event2.hashCode());
 
-        event2.segmentation = new HashMap<String, String>();
-        assertTrue(event1.equals(event2));
-        assertTrue(event2.equals(event1));
+        event2.segmentation = new HashMap<>();
+        assertEquals(event1, event2);
+        assertEquals(event2, event1);
         assertEquals(event1.hashCode(), event2.hashCode());
 
         event1.segmentation.put("segkey", "segvalue");
-        assertFalse(event1.equals(event2));
-        assertFalse(event2.equals(event1));
+        assertNotEquals(event1, event2);
+        assertNotEquals(event2, event1);
         assertTrue(event1.hashCode() != event2.hashCode());
 
         event2.segmentation.put("segkey", "segvalue");
-        assertTrue(event1.equals(event2));
-        assertTrue(event2.equals(event1));
+        assertEquals(event1, event2);
+        assertEquals(event2, event1);
         assertEquals(event1.hashCode(), event2.hashCode());
 
         event1.sum = 3.2;
         event2.count = 42;
-        assertTrue(event1.equals(event2));
-        assertTrue(event2.equals(event1));
+        assertEquals(event1, event2);
+        assertEquals(event2, event1);
         assertEquals(event1.hashCode(), event2.hashCode());
     }
 
@@ -129,7 +129,7 @@ public void testToJSON_emptySegmentation() throws JSONException {
         event.timestamp = 1234;
         event.count = 42;
         event.sum = 3.2;
-        event.segmentation = new HashMap<String, String>();
+        event.segmentation = new HashMap<>();
         final JSONObject jsonObj = event.toJSON();
         assertEquals(7, jsonObj.length());
         assertEquals(event.key, jsonObj.getString("key"));
@@ -146,7 +146,7 @@ public void testToJSON_withSegmentation() throws JSONException {
         event.timestamp = 1234;
         event.count = 42;
         event.sum = 3.2;
-        event.segmentation = new HashMap<String, String>();
+        event.segmentation = new HashMap<>();
         event.segmentation.put("segkey", "segvalue");
         final JSONObject jsonObj = event.toJSON();
         assertEquals(7, jsonObj.length());
@@ -165,7 +165,7 @@ public void testToJSON_sumNaNCausesJSONException() throws JSONException {
         event.timestamp = 1234;
         event.count = 42;
         event.sum = Double.NaN;
-        event.segmentation = new HashMap<String, String>();
+        event.segmentation = new HashMap<>();
         event.segmentation.put("segkey", "segvalue");
         final JSONObject jsonObj = event.toJSON();
         assertEquals(6, jsonObj.length());
@@ -293,7 +293,7 @@ public void testFromJSON_emptySegmentation() throws JSONException {
         expected.timestamp = 1234;
         expected.count = 42;
         expected.sum = 3.2;
-        expected.segmentation = new HashMap<String, String>();
+        expected.segmentation = new HashMap<>();
         final JSONObject jsonObj = new JSONObject();
         jsonObj.put("key", expected.key);
         jsonObj.put("timestamp", expected.timestamp);
@@ -313,7 +313,7 @@ public void testFromJSON_withSegmentation() throws JSONException {
         expected.timestamp = 1234;
         expected.count = 42;
         expected.sum = 3.2;
-        expected.segmentation = new HashMap<String, String>();
+        expected.segmentation = new HashMap<>();
         expected.segmentation.put("segkey", "segvalue");
         final JSONObject jsonObj = new JSONObject();
         jsonObj.put("key", expected.key);
@@ -338,7 +338,7 @@ public void testFromJSON_withSegmentation_nonStringValue() throws JSONException
         expected.segmentationDouble = new HashMap<>();
         expected.segmentationInt = new HashMap<>();
         expected.segmentationInt.put("segkey", 1234);
-        final Map<Object, Object> badMap = new HashMap<Object, Object>();
+        final Map<Object, Object> badMap = new HashMap<>();
         badMap.put("segkey", 1234); // this should be put into int segments
         final JSONObject jsonObj = new JSONObject();
         jsonObj.put("key", expected.key);
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigTests.java
index cfbfb9c3a..051687a4f 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/RemoteConfigTests.java
@@ -11,7 +11,7 @@
 public class RemoteConfigTests {
 
     @Before
-    public void setUp() throws Exception {
+    public void setUp() {
 
     }
 
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/UserDataTests.java b/sdk/src/androidTest/java/ly/count/android/sdk/UserDataTests.java
index 53acd87dc..fb06e8b15 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/UserDataTests.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/UserDataTests.java
@@ -22,7 +22,7 @@ public class UserDataTests {
 
     @Test
 	public void testSetData(){
-        HashMap<String, String> data = new HashMap<String, String>();
+        HashMap<String, String> data = new HashMap<>();
         data.put("name", "Test Test");
 		data.put("username", "test");
 		data.put("email", "test@gmail.com");
@@ -45,7 +45,7 @@ public void testSetData(){
 
     @Test
     public void testCustomData() {
-        HashMap<String, String> data = new HashMap<String, String>();
+        HashMap<String, String> data = new HashMap<>();
         data.put("key1", "value1");
         data.put("key2", "value2");
         UserData.setCustomData(data);
@@ -73,21 +73,21 @@ public void testCustomModifiers() throws JSONException {
     public void testClear() {
         UserData.clear();
 
-        assertEquals(null, UserData.name);
-        assertEquals(null, UserData.username);
-        assertEquals(null, UserData.email);
-        assertEquals(null, UserData.org);
-        assertEquals(null, UserData.phone);
-        assertEquals(null, UserData.gender);
-        assertEquals(null, UserData.picture);
+        assertNull(UserData.name);
+        assertNull(UserData.username);
+        assertNull(UserData.email);
+        assertNull(UserData.org);
+        assertNull(UserData.phone);
+        assertNull(UserData.gender);
+        assertNull(UserData.picture);
         assertEquals(0, UserData.byear);
-        assertEquals(null, UserData.custom);
-        assertEquals(null, UserData.customMods);
+        assertNull(UserData.custom);
+        assertNull(UserData.customMods);
     }
 
     @Test
 	public void testJSON() throws JSONException{
-        HashMap<String, String> data = new HashMap<String, String>();
+        HashMap<String, String> data = new HashMap<>();
         data.put("name", "Test Test");
         data.put("username", "test");
         data.put("email", "test@gmail.com");
@@ -98,7 +98,7 @@ public void testJSON() throws JSONException{
         data.put("byear", "2000");
         UserData.setData(data);
 
-        HashMap<String, String> customdata = new HashMap<String, String>();
+        HashMap<String, String> customdata = new HashMap<>();
         customdata.put("key1", "value1");
         customdata.put("key2", "value2");
         UserData.setCustomData(customdata);
diff --git a/sdk/src/main/java/ly/count/android/sdk/AdvertisingIdAdapter.java b/sdk/src/main/java/ly/count/android/sdk/AdvertisingIdAdapter.java
index cf2fe876f..5f166608c 100644
--- a/sdk/src/main/java/ly/count/android/sdk/AdvertisingIdAdapter.java
+++ b/sdk/src/main/java/ly/count/android/sdk/AdvertisingIdAdapter.java
@@ -60,7 +60,7 @@ private static String getAdvertisingId(final Context context) throws Throwable{
     }
 
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")
-    private static boolean isLimitAdTrackingEnabled(final Context context) throws Throwable{
+    private static boolean isLimitAdTrackingEnabled(final Context context) {
         try {
             final Class<?> cls = Class.forName(ADVERTISING_ID_CLIENT_CLASS_NAME);
             final Method getAdvertisingIdInfo = cls.getMethod("getAdvertisingIdInfo", Context.class);
diff --git a/sdk/src/main/java/ly/count/android/sdk/ConnectionProcessor.java b/sdk/src/main/java/ly/count/android/sdk/ConnectionProcessor.java
index 73ceaba19..ddce9f80b 100644
--- a/sdk/src/main/java/ly/count/android/sdk/ConnectionProcessor.java
+++ b/sdk/src/main/java/ly/count/android/sdk/ConnectionProcessor.java
@@ -58,7 +58,7 @@ public class ConnectionProcessor implements Runnable {
     private final String serverURL_;
     private final SSLContext sslContext_;
 
-    private Map<String, String> requestHeaderCustomValues_;
+    private final Map<String, String> requestHeaderCustomValues_;
 
     protected static String salt;
 
diff --git a/sdk/src/main/java/ly/count/android/sdk/Countly.java b/sdk/src/main/java/ly/count/android/sdk/Countly.java
index b5dc29a17..746b5c281 100644
--- a/sdk/src/main/java/ly/count/android/sdk/Countly.java
+++ b/sdk/src/main/java/ly/count/android/sdk/Countly.java
@@ -166,9 +166,9 @@ private static class SingletonHolder {
     //GDPR
     protected boolean requiresConsent = false;
 
-    private Map<String, Boolean> featureConsentValues = new HashMap<>();
-    private Map<String, String[]> groupedFeatures = new HashMap<>();
-    private List<String> collectedConsentChanges = new ArrayList<>();
+    private final Map<String, Boolean> featureConsentValues = new HashMap<>();
+    private final Map<String, String[]> groupedFeatures = new HashMap<>();
+    private final List<String> collectedConsentChanges = new ArrayList<>();
 
     Boolean delayedPushConsent = null;//if this is set, consent for push has to be set before finishing init and sending push changes
     boolean delayedLocationErasure = false;//if location needs to be cleared at the end of init
@@ -190,7 +190,7 @@ public static class CountlyFeatureNames {
     }
 
     //a list of valid feature names that are used for checking
-    private String[] validFeatureNames = new String[]{
+    private final String[] validFeatureNames = new String[]{
             CountlyFeatureNames.sessions,
             CountlyFeatureNames.events,
             CountlyFeatureNames.views,
@@ -2516,7 +2516,7 @@ public synchronized Countly crashTest(int crashNumber) {
                 Log.d(Countly.TAG, "Running crashTest 2");
             }
 
-            //noinspection UnusedAssignment
+            //noinspection UnusedAssignment,divzero
             @SuppressWarnings("NumericOverflow") int test = 10/0;
 
         }else if (crashNumber == 3){
diff --git a/sdk/src/main/java/ly/count/android/sdk/CountlyStarRating.java b/sdk/src/main/java/ly/count/android/sdk/CountlyStarRating.java
index d340f59cc..232cc80c7 100644
--- a/sdk/src/main/java/ly/count/android/sdk/CountlyStarRating.java
+++ b/sdk/src/main/java/ly/count/android/sdk/CountlyStarRating.java
@@ -77,7 +77,7 @@ public static void showStarRatingCustom(
 
         LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
         View dialogLayout = inflater.inflate(R.layout.star_rating_layout, null);
-        RatingBar ratingBar = (RatingBar) dialogLayout.findViewById(R.id.ratingBar);
+        RatingBar ratingBar = dialogLayout.findViewById(R.id.ratingBar);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(context)
                 .setTitle(title)
@@ -576,11 +576,11 @@ protected JSONObject doInBackground(Object... params) {
 
                 reader = new BufferedReader(new InputStreamReader(stream));
 
-                StringBuffer buffer = new StringBuffer();
+                StringBuilder buffer = new StringBuilder();
                 String line = "";
 
                 while ((line = reader.readLine()) != null) {
-                    buffer.append(line+"\n");
+                    buffer.append(line).append("\n");
                 }
 
                 if(wasSuccess) {