diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java b/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
index 5258fda..9d8fd28 100644
--- a/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
+++ b/android/src/main/java/com/wix/reactnativenotifications/core/notification/PushNotification.java
@@ -25,16 +25,12 @@ import com.wix.reactnativenotifications.core.notificationdrawer.PushNotification
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_OPENED_EVENT_NAME;
 import static com.wix.reactnativenotifications.Defs.NOTIFICATION_RECEIVED_EVENT_NAME;
 
-// TODO:
-// 1. Opening the from notif, then tapping 'home', the opening from launcher icon results in main activity over main activity
-// 2. Double check initial notification set up and clearing
-
 public class PushNotification implements IPushNotification {
 
-    final private Context mContext;
-    final private AppLifecycleFacade mAppLifecycleFacade;
-    final private PushNotificationProps mNotificationProps;
-    final private AppVisibilityListener mAppVisibilityListener = new AppVisibilityListener() {
+    final protected Context mContext;
+    final protected AppLifecycleFacade mAppLifecycleFacade;
+    final protected PushNotificationProps mNotificationProps;
+    final protected AppVisibilityListener mAppVisibilityListener = new AppVisibilityListener() {
         @Override
         public void onAppVisible() {
             mAppLifecycleFacade.removeVisibilityListener(this);
diff --git a/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java b/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
index c0aa923..7623f8f 100644
--- a/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
+++ b/android/src/main/java/com/wix/reactnativenotifications/core/notificationdrawer/PushNotificationsDrawer.java
@@ -9,7 +9,7 @@ import com.wix.reactnativenotifications.core.InitialNotification;
 
 public class PushNotificationsDrawer implements IPushNotificationsDrawer {
 
-    protected final Context mContext;
+    final protected Context mContext;
 
     public PushNotificationsDrawer(Context context) {
         mContext = context;