diff --git a/nogotofail/test/android/.gitignore b/nogotofail/test/android/.gitignore
index 67495841..e7b0284d 100644
--- a/nogotofail/test/android/.gitignore
+++ b/nogotofail/test/android/.gitignore
@@ -8,6 +8,7 @@ WORKSPACE
 # Generated files
 bin/
 gen/
+*.apk
 
 # Gradle files
 .gradle/
diff --git a/nogotofail/test/android/app/build.gradle b/nogotofail/test/android/app/build.gradle
index 9a83f1c0..7aed9a9c 100644
--- a/nogotofail/test/android/app/build.gradle
+++ b/nogotofail/test/android/app/build.gradle
@@ -16,4 +16,8 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    dependencies {
+        compile 'com.google.android.gms:play-services:8.1.0'
+    }
 }
diff --git a/nogotofail/test/android/app/src/main/AndroidManifest.xml b/nogotofail/test/android/app/src/main/AndroidManifest.xml
index e26ee851..220b324e 100644
--- a/nogotofail/test/android/app/src/main/AndroidManifest.xml
+++ b/nogotofail/test/android/app/src/main/AndroidManifest.xml
@@ -24,6 +24,8 @@
         android:targetSdkVersion="21" />
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 
     <application
         android:allowBackup="true"
diff --git a/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/BackgroundTestForHttpPii.java b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/BackgroundTestForHttpPii.java
new file mode 100644
index 00000000..244c5188
--- /dev/null
+++ b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/BackgroundTestForHttpPii.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.nogotofail.mitmtester;
+
+import android.content.Context;
+import android.location.Location;
+import com.google.android.gms.ads.identifier.AdvertisingIdClient;
+import net.nogotofail.mitmtester.util.ClientProperties;
+
+/**
+ * Extension of BackgroundTest class with awareness of application context.
+ * Note. Application context is needed to access system resources (Device IDs &
+ * location) and application resources (strings.xml).
+ */
+public abstract class BackgroundTestForHttpPii extends BackgroundTest {
+
+    protected static final String HTTP_TARGET = "http://android.com/";
+    protected static final String HTTPS_TARGET = "https://google.com/";
+    protected static final int CONNECTION_TIMEOUT = 10000;
+
+    protected String android_id, google_ad_id;
+    protected AdvertisingIdClient.Info advertising_info;
+    protected Location client_location;
+    protected String location_longitude, location_latitude;
+
+    private Context mContext;
+
+    protected BackgroundTestForHttpPii(Context app_context) {
+        mContext = app_context;
+    }
+
+    protected abstract void runTest() throws Exception;
+
+    protected Context getContext(){
+        return this.mContext;
+    }
+
+    protected void FetchPIITestData() {
+        android_id = ClientProperties.getAndroidId(mContext);
+        advertising_info = ClientProperties.getAdvertisingId(mContext);
+        google_ad_id = advertising_info.getId();
+        client_location = ClientProperties.getDeviceLocation(mContext);
+        location_longitude = String.valueOf(client_location.getLongitude());
+        location_latitude = String.valueOf(client_location.getLatitude());
+    }
+}
diff --git a/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpPiiTest.java b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpPiiTest.java
new file mode 100644
index 00000000..c2238f89
--- /dev/null
+++ b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpPiiTest.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2014 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.nogotofail.mitmtester.http;
+
+import net.nogotofail.mitmtester.BackgroundTestForHttpPii;
+
+import android.content.Context;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.protocol.HTTP;
+import org.json.JSONObject;
+
+/*
+ *  HttpPiiTest simulates the scenario where PII appears
+ *  in the HTTP requests and responses.
+ */
+public class HttpPiiTest extends BackgroundTestForHttpPii {
+
+    HttpURLConnection connection = null;
+    URL url;
+
+    protected HttpPiiTest(Context app_context) {
+        super(app_context);
+    }
+    /**
+     * Runs tests with PII in HTTP request and responses.
+     */
+    @Override
+    protected void runTest() throws Exception {
+        // Retrieve PII for testing
+        FetchPIITestData();
+        // Run PII in clear-text (HTTP) query string
+        RunPiiQueryStringTest();
+        // Run PII in clear-text (HTTP) headers
+        RunPiiHeaderTest();
+        // Run PII in clear-text (HTTP) message body
+        RunPiiMessageBodyTest();
+    }
+
+    /**
+     * Runs tests inserting PII in request query strings.
+     */
+    protected void RunPiiQueryStringTest() throws Exception {
+        try {
+            // Send request with PII identifier in query string
+            url = new URL(HTTP_TARGET + "?google_ad_id=" + google_ad_id);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            setProgressMessage("Issuing HTTP request with (clear-text) PII IDs in query string");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+
+            // Send request with PII location in query string
+            url = new URL(HTTP_TARGET + "?longtitude=" + location_longitude +
+                    "&latitude=" + location_latitude);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            setProgressMessage("Issuing HTTP request with (clear-text) PII location in query string");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+        } catch (Exception e) {
+            setTestResult("Error: " + " " + e.getMessage());
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    /**
+     * Runs tests inserting PII in request headers.
+     */
+    protected void RunPiiHeaderTest() throws Exception {
+        try {
+            // Send request with PII identifier in HTTP header
+            url = new URL(HTTP_TARGET);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            connection.setRequestProperty("Header-Identifier", google_ad_id);
+            setProgressMessage("Issuing HTTP request with (clear-text) PII ID in header");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+
+            // Send request with PII location in HTTP header
+            url = new URL(HTTP_TARGET);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            connection.setRequestProperty("Header-Longitude", location_longitude);
+            connection.setRequestProperty("Header-Latitude", location_latitude);
+            setProgressMessage("Issuing HTTP request with (clear-text) PII location in header");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+        }
+        finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    /**
+     * Runs tests inserting PII in request and response message bodies.
+     */
+    protected void RunPiiMessageBodyTest() throws Exception {
+        HttpClient client = new DefaultHttpClient();
+        HttpConnectionParams.setConnectionTimeout(client.getParams(), CONNECTION_TIMEOUT); //Timeout Limit
+        HttpResponse response;
+        JSONObject json_data;
+        int response_code;
+        String response_message;
+
+        // Send PII identifier in HTTP POST request
+        try {
+            HttpPost post = new HttpPost(HTTP_TARGET);
+            json_data = new JSONObject();
+            json_data.put("google_ad_id", google_ad_id);
+            StringEntity se = new StringEntity(json_data.toString());
+            se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
+            post.setEntity(se);
+            setProgressMessage("Issuing HTTP request with (clear-text) PII identifiers in " +
+                    "message body");
+            response = client.execute(post);
+
+            // Checking response
+            if(response!=null){
+                //Get the data in the entity
+                response_code = response.getStatusLine().getStatusCode();
+                response_message = response.getStatusLine().getReasonPhrase();
+                setTestResult(Integer.toString(response_code) + " " + response_message);
+            }
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+
+        // Send PII location in HTTP POST request
+        try {
+            HttpPost post = new HttpPost(HTTP_TARGET);
+            json_data = new JSONObject();
+            json_data.put("location_longitude", location_longitude);
+            json_data.put("location_latitude", location_latitude);
+            StringEntity se = new StringEntity(json_data.toString());
+            se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
+            post.setEntity(se);
+            setProgressMessage("Issuing HTTP request with (clear-text) PII location in " +
+                    "message body");
+            response = client.execute(post);
+
+            // Checking response
+            if(response!=null){
+                //Get the data in the entity
+                response_code = response.getStatusLine().getStatusCode();
+                response_message = response.getStatusLine().getReasonPhrase();
+                setTestResult(Integer.toString(response_code) + " " + response_message);
+            }
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpTestActivity.java b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpTestActivity.java
index 125d6f67..70add91c 100644
--- a/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpTestActivity.java
+++ b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpTestActivity.java
@@ -16,6 +16,7 @@
 
 package net.nogotofail.mitmtester.http;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.view.View;
 import net.nogotofail.mitmtester.R;
@@ -29,11 +30,24 @@ protected void onCreate(Bundle savedInstanceState) {
 
     setContentView(R.layout.http_test_activity);
 
+    final Context app_context = this.getApplicationContext();
+
     findViewById(R.id.http_with_authorization).setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View v) {
         startTest(new CleartextHttpCredentialsTest());
       }
     });
+
+    findViewById(R.id.test_http_pii).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) { startTest(new HttpPiiTest(app_context));
+      }
+    });
+
+    findViewById(R.id.test_https_pii).setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) { startTest(new HttpsPiiTest(app_context)); }
+    });
   }
 }
diff --git a/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpsPiiTest.java b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpsPiiTest.java
new file mode 100644
index 00000000..94793c46
--- /dev/null
+++ b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/http/HttpsPiiTest.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright 2014 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.nogotofail.mitmtester.http;
+
+import net.nogotofail.mitmtester.BackgroundTestForHttpPii;
+
+import android.content.Context;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.message.BasicHeader;
+import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.protocol.HTTP;
+import org.json.JSONObject;
+
+/*
+ *  HttpsPiiTest simulates the scenario where PII appears
+ *  in the HTTPS requests and responses.
+ */
+public class HttpsPiiTest extends BackgroundTestForHttpPii {
+
+    HttpURLConnection connection = null;
+    URL url;
+    final int NUM_TEST_ITERATIONS = 2;
+
+    protected HttpsPiiTest(Context app_context) {
+        super(app_context);
+    }
+    /**
+     * Runs tests with PII in HTTPS request and responses.
+     */
+    @Override
+    protected void runTest() throws Exception {
+        // Retrieve PII for testing
+        FetchPIITestData();
+
+        for(int i = 0; i <= NUM_TEST_ITERATIONS; i++) {
+            // Run PII in clear-text (HTTP) query string
+            RunPiiQueryStringTest();
+            // Run PII in clear-text (HTTP) headers
+            RunPiiHeaderTest();
+            // Run PII in clear-text (HTTP) message body
+            RunPiiMessageBodyTest();
+        }
+    }
+
+    /**
+     * Runs tests inserting PII in request query strings.
+     * @throws Exception
+     */
+    protected void RunPiiQueryStringTest() throws Exception {
+        try {
+            // Send request with PII identifier in query string
+            url = new URL(HTTPS_TARGET + "?google_ad_id=" + google_ad_id);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            setProgressMessage("Issuing HTTPS request with PII ID in query string");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+
+            // Send request with PII location in query string
+            url = new URL(HTTPS_TARGET + "?longtitude=" + location_longitude +
+                    "&latitude=" + location_latitude);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            setProgressMessage("Issuing HTTPS request with PII location in query string");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+        } catch (Exception e) {
+            setTestResult("Error: " + " " + e.getMessage());
+        } finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    /**
+     * Runs tests inserting PII in request headers.
+     */
+    protected void RunPiiHeaderTest() throws Exception {
+        try {
+            // Send request with PII identifier in HTTP header
+            url = new URL(HTTPS_TARGET);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            connection.setRequestProperty("Header-Identifier", google_ad_id);
+            setProgressMessage("Issuing HTTPS request with PII ID in header");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+
+            // Send request with PII location in HTTP header
+            url = new URL(HTTPS_TARGET);
+            connection = (HttpURLConnection) url.openConnection();
+            connection.setConnectTimeout(CONNECTION_TIMEOUT);
+            connection.setReadTimeout(CONNECTION_TIMEOUT);
+            connection.setRequestProperty("Header-Longitude", location_longitude);
+            connection.setRequestProperty("Header-Latitude", location_latitude);
+            setProgressMessage("Issuing HTTPS request with PII location in header");
+            setTestResult(connection.getResponseCode() + " " + connection.getResponseMessage());
+            connection.disconnect();
+        }
+        finally {
+            if (connection != null) {
+                connection.disconnect();
+            }
+        }
+    }
+
+    /**
+     * Runs tests inserting PII in request and response message bodies.
+     */
+    protected void RunPiiMessageBodyTest() throws Exception {
+        HttpClient client = new DefaultHttpClient();
+        HttpConnectionParams.setConnectionTimeout(client.getParams(), CONNECTION_TIMEOUT); //Timeout Limit
+        HttpResponse response;
+        JSONObject json_data;
+        int response_code;
+        String response_message;
+
+        // Send PII identifier in HTTP POST request
+        try {
+            HttpPost post = new HttpPost(HTTPS_TARGET);
+            json_data = new JSONObject();
+            json_data.put("google_ad_id", google_ad_id);
+            StringEntity se = new StringEntity(json_data.toString());
+            se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
+            post.setEntity(se);
+            setProgressMessage("Issuing HTTPS request with identifiers in message body");
+            response = client.execute(post);
+
+            // Checking response
+            if(response!=null){
+                //Get the data in the entity
+                response_code = response.getStatusLine().getStatusCode();
+                response_message = response.getStatusLine().getReasonPhrase();
+                setTestResult(Integer.toString(response_code) + " " + response_message);
+            }
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+
+        // Send PII location in HTTP POST request
+        try {
+            HttpPost post = new HttpPost(HTTPS_TARGET);
+            json_data = new JSONObject();
+            json_data.put("location_longitude", location_longitude);
+            json_data.put("location_latitude", location_latitude);
+            StringEntity se = new StringEntity(json_data.toString());
+            se.setContentType(new BasicHeader(HTTP.CONTENT_TYPE, "application/json"));
+            post.setEntity(se);
+            setProgressMessage("Issuing HTTPS request with PII location in message body");
+            response = client.execute(post);
+
+            // Checking response
+            if(response!=null){
+                //Get the data in the entity
+                response_code = response.getStatusLine().getStatusCode();
+                response_message = response.getStatusLine().getReasonPhrase();
+                setTestResult(Integer.toString(response_code) + " " + response_message);
+            }
+        } catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+}
diff --git a/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/util/ClientProperties.java b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/util/ClientProperties.java
new file mode 100644
index 00000000..ebd003f7
--- /dev/null
+++ b/nogotofail/test/android/app/src/main/java/net/nogotofail/mitmtester/util/ClientProperties.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2014 Google Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.nogotofail.mitmtester.util;
+
+import android.content.Context;
+import android.location.Criteria;
+import android.location.Location;
+import android.location.LocationManager;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import com.google.android.gms.ads.identifier.AdvertisingIdClient;
+import com.google.android.gms.ads.identifier.AdvertisingIdClient.Info;
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
+import com.google.android.gms.common.GooglePlayServicesRepairableException;
+
+import java.io.IOException;
+
+ /*
+ *  ClientProperties provides methods to retrieve user and device details.
+ */
+public class ClientProperties {
+
+    public static String getAndroidId(Context context) {
+        return Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+    }
+
+    public static Info getAdvertisingId(Context context) {
+        Info advertising_info;
+        try {
+            advertising_info = AdvertisingIdClient.getAdvertisingIdInfo(context);
+            /**
+             * TODO: Include check to alert when device user has enabled "Limit Ad Tracking"
+             *       for their Google account. This will allow testers to verify apps sending the
+             *       user's "Android ID" to advertisers when they shouldn't.
+             */
+            //final boolean ad_tracking_limited = advertising_info.isLimitAdTrackingEnabled();
+        } catch (GooglePlayServicesRepairableException | GooglePlayServicesNotAvailableException |
+                 IOException e) {
+            /** Encountered a recoverable error connecting to Google Play services OR
+             *  Google Play services is not available entirely OR
+             * a general IO exception.
+             */
+            advertising_info = null;
+        }
+        return advertising_info;
+    }
+
+    public static String getDeviceId(Context context) {
+        //Retrieve a reference to an instance of TelephonyManager
+        TelephonyManager telephonyManager =
+                (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
+        // Fetch the device's unique ID if it exists.
+        // Note. This varies depending on network e.g. IMEI for GSM, MEID/ESN for CDMA.
+        String device_id = telephonyManager.getDeviceId();
+        if (device_id == null){
+            return null;
+        }
+        else {
+            return device_id;
+        }
+    }
+
+    public static String getMacAddress (Context context) {
+        WifiManager wifi_manager = (WifiManager)context.getSystemService(Context.WIFI_SERVICE);
+        WifiInfo wifi_info = wifi_manager.getConnectionInfo();
+
+        // Fetch the device's WiFi MAC address.
+        String mac_address = wifi_info.getMacAddress();
+        if (mac_address == null) {
+            return null;
+        }
+        else {
+            return mac_address;
+        }
+    }
+
+    public static Location getDeviceLocation (Context context) {
+        Location last_known_location = null;
+        try {
+            LocationManager location_manager =
+                    (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
+
+            Criteria criteria = new Criteria();
+            criteria.setAccuracy(Criteria.ACCURACY_FINE);
+            String location_provider = location_manager.getBestProvider(criteria, false);
+            last_known_location = location_manager.getLastKnownLocation(location_provider);
+        }
+        catch (Exception e) {
+
+        }
+        return last_known_location;
+    }
+}
diff --git a/nogotofail/test/android/app/src/main/res/layout/http_test_activity.xml b/nogotofail/test/android/app/src/main/res/layout/http_test_activity.xml
index 35116ea3..03112f19 100644
--- a/nogotofail/test/android/app/src/main/res/layout/http_test_activity.xml
+++ b/nogotofail/test/android/app/src/main/res/layout/http_test_activity.xml
@@ -17,15 +17,29 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <LinearLayout 
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
+
         <Button
             android:id="@+id/http_with_authorization"
             android:text="@string/test_http_with_authorization"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             />
+        <Button
+            android:id="@+id/test_http_pii"
+            android:text="@string/test_http_pii"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+        <Button
+            android:id="@+id/test_https_pii"
+            android:text="@string/test_https_pii"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            />
+
     </LinearLayout>
 </ScrollView>
diff --git a/nogotofail/test/android/app/src/main/res/values/strings.xml b/nogotofail/test/android/app/src/main/res/values/strings.xml
index 2b64a654..d83db2e3 100644
--- a/nogotofail/test/android/app/src/main/res/values/strings.xml
+++ b/nogotofail/test/android/app/src/main/res/values/strings.xml
@@ -32,5 +32,13 @@
         HTTPS request without server authentication
     </string>
 
-    <string name="test_http_with_authorization">HTTP request with Authorization header</string>
+    <string name="test_http_with_authorization">
+        HTTP request with Authorization header
+    </string>
+    <string name="test_http_pii">
+        PII in HTTP traffic
+    </string>
+    <string name="test_https_pii">
+        PII in HTTPS traffic
+    </string>
 </resources>