diff --git a/README.md b/README.md
index 3f2c680..41b40b1 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,8 @@ Basic reference
 
 >[getUDID](hypsystem/system/platform/Android.hx#L35): Return the device UDID.
 
+>[isFirebaseTestLab](hypsystem/system/platform/Android.hx#L46): Return if device is currently in the Pre-Launch test lab.
+
 #### The [DateTools](hypsystem/system/DateTools.hx) class (hypsystem.system.DateTools)
 Adding ISO & UTF date support to haxe by using native methods (iOS & Android)
 
diff --git a/dependencies/hyp-system/project.properties b/dependencies/hyp-system/project.properties
index d934282..f35fc59 100755
--- a/dependencies/hyp-system/project.properties
+++ b/dependencies/hyp-system/project.properties
@@ -14,3 +14,6 @@ android.library.reference.2=../joda-time
 
 # Project target.
 target=android-::ANDROID_TARGET_SDK_VERSION::
+
+java.source=7
+java.target=7
\ No newline at end of file
diff --git a/dependencies/hyp-system/src/hypsystem/system/platform/Android.java b/dependencies/hyp-system/src/hypsystem/system/platform/Android.java
index f0db4cf..b643c68 100755
--- a/dependencies/hyp-system/src/hypsystem/system/platform/Android.java
+++ b/dependencies/hyp-system/src/hypsystem/system/platform/Android.java
@@ -90,4 +90,13 @@ public static float getDensity()
 		return metrics.density;
 	}
 
+	public static boolean isFirebaseTestLab()
+	{
+		String testLabSetting = Settings.System.getString(HypSystem.mainContext.getContentResolver(), "firebase.test.lab");
+		if ("true".equals(testLabSetting)) {
+			return true;
+		}
+		return false;
+	}
+
 }
\ No newline at end of file
diff --git a/dependencies/joda-time/project.properties b/dependencies/joda-time/project.properties
index 91d2b02..1ac3344 100644
--- a/dependencies/joda-time/project.properties
+++ b/dependencies/joda-time/project.properties
@@ -11,5 +11,8 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-::ANDROID_TARGET_SDK_VERSION::
 android.library=true
+
+java.source=7
+java.target=7
\ No newline at end of file
diff --git a/hypsystem/net/NetworkInfos.hx b/hypsystem/net/NetworkInfos.hx
index 28a601c..c9266af 100755
--- a/hypsystem/net/NetworkInfos.hx
+++ b/hypsystem/net/NetworkInfos.hx
@@ -48,6 +48,7 @@ class NetworkInfos
 				ConnectionType.MOBILE;
 
 			case _:
+				ConnectionType.NONE;
 		}
 
 		return res;
diff --git a/hypsystem/system/platform/Android.hx b/hypsystem/system/platform/Android.hx
index abc3f10..0c03001 100755
--- a/hypsystem/system/platform/Android.hx
+++ b/hypsystem/system/platform/Android.hx
@@ -36,4 +36,15 @@ class Android
 	{
 		return "";
 	}
+
+	/**
+	Find out if device is currently in the Pre-Launch test lab
+	https://firebase.google.com/docs/test-lab/android-studio
+
+	@return True or false (Bool)
+	**/
+	@JNI public static function isFirebaseTestLab():Bool
+	{
+		return false;
+	}
 }
\ No newline at end of file