diff --git a/build/lib/test/test.js b/build/lib/test/test.js
index 81392c1f4ef..b69e2f5e20a 100644
--- a/build/lib/test/test.js
+++ b/build/lib/test/test.js
@@ -221,7 +221,7 @@ async function addTiAppProperties() {
 	const tiapp_xml_string = await fs.readFile(tiapp_xml, 'utf8');
 	const content = [];
 	const insertManifest = () => {
-		content.push('\t\t\t<application android:theme="@style/Theme.Titanium.Dark">');
+		content.push('\t\t\t<application android:theme="@style/Theme.Titanium.Dark"  android:icon="@mipmap/ic_launcher">');
 		content.push('\t\t\t\t<meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyCN_aC6RMaynan8YzsO1HNHbhsr9ZADDlY"/>');
 		content.push('\t\t\t\t<uses-library android:name="org.apache.http.legacy" android:required="false" />');
 		content.push(`\t\t\t\t<activity android:name=".${PROJECT_NAME.charAt(0).toUpperCase() + PROJECT_NAME.slice(1).toLowerCase()}Activity" android:exported="true">`);
@@ -291,7 +291,7 @@ async function addTiAppProperties() {
 		content.push('\t\t\t\t\t\t<key>UIApplicationShortcutItemType</key>');
 		content.push('\t\t\t\t\t\t<string>static_shortcut1</string>');
 		content.push('\t\t\t\t\t</dict>');
-		content.push('\t\t\t\t</array');
+		content.push('\t\t\t\t</array>');
 	};
 
 	// Not so smart but this should work...
@@ -300,6 +300,9 @@ async function addTiAppProperties() {
 		if (line.indexOf('\t<guid>') >= 0) {
 			line = '\t<guid>1c4b748c-7c16-4df1-bd5c-4ffe6240286e</guid>';
 		}
+		if (line.indexOf('<application android:icon="@mipmap/ic_launcher"/>') > 0) {
+			line = '';
+		}
 
 		content.push(line);
 		if (line.indexOf('<ios>') >= 0) {
diff --git a/tests/Resources/android/snapshots/textfieldPadding@2.625x.png b/tests/Resources/android/snapshots/textfieldPadding@2.625x.png
new file mode 100644
index 00000000000..5224d457efc
Binary files /dev/null and b/tests/Resources/android/snapshots/textfieldPadding@2.625x.png differ
diff --git a/tests/Resources/ti.network.httpclient.test.js b/tests/Resources/ti.network.httpclient.test.js
index 0660dd0eb78..854271d6bff 100644
--- a/tests/Resources/ti.network.httpclient.test.js
+++ b/tests/Resources/ti.network.httpclient.test.js
@@ -151,7 +151,7 @@ describe('Titanium.Network.HTTPClient', function () {
 			}
 		};
 
-		xhr.open('GET', 'http://mockbin.org/redirect/301?to=https%3A%2F%2Fraw.githubusercontent.com%2Fappcelerator%2Ftitanium_mobile%2Fmaster%2Ftests%2FResources%2Flarge.jpg');
+		xhr.open('GET', 'https://httpbin.org/redirect-to?url=https%3A%2F%2Fraw.githubusercontent.com%2Ftidev%2Ftitanium-sdk%2Fmaster%2Ftests%2FResources%2Flarge.jpg');
 		xhr.send();
 	});
 
@@ -746,7 +746,7 @@ describe('Titanium.Network.HTTPClient', function () {
 				const html = e.source.responseText;
 				try {
 					// should(html).match(/id="protocol_tls1_3">(\s*<span\s+title="RFC 8446"\s*>\s*)?(<font color=green>)?Yes/);
-					should(html).match(/id="protocol_tls1_3">(<font color=green>)?Yes/);
+					should(html).match(/TLS 1.3/);
 				} catch (err) {
 					return finish(err);
 				}
@@ -755,7 +755,7 @@ describe('Titanium.Network.HTTPClient', function () {
 			onerror: _e => finish(new Error('Could not determine TLSv3 support.')),
 			timeout: 8000
 		});
-		client.open('GET', 'https://clienttest.ssllabs.com/ssltest/viewMyClient.html');
+		client.open('GET', 'https://www.howsmyssl.com/a/check');
 		client.send();
 	});