diff --git a/android/.gitignore b/android/.gitignore
index 0151b2c95a..2ed37c8245 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -2,6 +2,7 @@ bin/
 gen/
 .settings/
 resbuilder/
+spoon-output/
 
 .classpath
 .cproject
diff --git a/android/MapsWithMePro/AndroidManifest.xml b/android/MapsWithMePro/AndroidManifest.xml
index b3730c57a4..4ee7c2f222 100644
--- a/android/MapsWithMePro/AndroidManifest.xml
+++ b/android/MapsWithMePro/AndroidManifest.xml
@@ -38,6 +38,10 @@
     <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
+	  <!-- Used by instrumentation tests only. Do not include in production apps unless necessary! -->
+	  <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+	  <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
     <supports-screens
         android:largeScreens="true"
         android:xlargeScreens="true" />
diff --git a/android/src/com/mapswithme/maps/MapObjectActivity.java b/android/src/com/mapswithme/maps/MapObjectActivity.java
index 7541cda9a8..c4902e025e 100644
--- a/android/src/com/mapswithme/maps/MapObjectActivity.java
+++ b/android/src/com/mapswithme/maps/MapObjectActivity.java
@@ -33,11 +33,11 @@ public class MapObjectActivity extends FragmentActivity
   private static String EXTRA_BMK_CAT = "bookmark_category";
   private static String EXTRA_BMK_INDEX = "bookmark_index";
   //for POI and API point
-  private static String EXTRA_NAME = "name";
-  private static String EXTRA_TYPE = "type";
-  private static String EXTRA_ADDRESS = "address";
-  private static String EXTRA_LAT = "lat";
-  private static String EXTRA_LON = "lon";
+  public static final String EXTRA_NAME = "name";
+  public static final String EXTRA_TYPE = "type";
+  public static final String EXTRA_ADDRESS = "address";
+  public static final String EXTRA_LAT = "lat";
+  public static final String EXTRA_LON = "lon";
 
   public static void startWithBookmark(Context context, int categoryIndex, int bookmarkIndex)
   {
@@ -107,7 +107,7 @@ public class MapObjectActivity extends FragmentActivity
     handleIntent(intent);
   }
 
-  private void handleIntent(Intent intent)
+  public void handleIntent(Intent intent)
   {
     final MapObjectType type = (MapObjectType) intent.getSerializableExtra(EXTRA_OBJECT_TYPE);