diff --git a/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
index 00695023a604664b4b05517dd086222246aa3108..b155dfa030021809938eb3bb89c6d22d908f71cf 100644
--- a/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
+++ b/android/app/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotificationProps.java
@@ -21,11 +21,11 @@ public class PushNotificationProps {
     }
 
     public String getTitle() {
-        return mBundle.getString("title", "");
+        return mBundle.getString("title");
     }
 
     public String getBody() {
-        return mBundle.getString("body", "");
+        return mBundle.getString("body");
     }
 
     public Bundle asBundle() {
diff --git a/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java b/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
index 5da59862686164f96bb6a5510bf477a9c35e52f8..c952dedff3f667669a6ff0ac25f5e6e407964b3e 100644
--- a/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
+++ b/android/app/src/test/java/com/wix/reactnativenotifications/core/notification/PushNotificationTest.java
@@ -6,6 +6,8 @@ import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.os.Bundle;
 
 import com.facebook.react.bridge.ReactContext;
@@ -54,6 +56,8 @@ public class PushNotificationTest {
     @Mock private AppLifecycleFacade mAppLifecycleFacade;
     @Mock private AppLaunchHelper mAppLaunchHelper;
     @Mock private JsIOHelper mJsIOHelper;
+    @Mock private Resources mResources;
+    @Mock private PackageManager mPackageManager;
 
     @Before
     public void setup() throws Exception {
@@ -68,7 +72,8 @@ public class PushNotificationTest {
 
         ApplicationInfo ai = mock(ApplicationInfo.class);
         when(mContext.getApplicationInfo()).thenReturn(ai);
-
+        when(mContext.getResources()).thenReturn(mResources);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getSystemService(Context.NOTIFICATION_SERVICE)).thenReturn(mNotificationManager);
     }