diff --git a/.gitmodules b/.gitmodules
index 5ae7c1a..7c9b476 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "Flagsmith.EngineTest/EngineTestData"]
 	path = Flagsmith.EngineTest/EngineTestData
 	url = git@github.com:Flagsmith/engine-test-data.git
-	tag = v3.4.2
+	tag = v3.5.0
diff --git a/Flagsmith.Engine/Engine.cs b/Flagsmith.Engine/Engine.cs
index ca2c423..4cabe8d 100644
--- a/Flagsmith.Engine/Engine.cs
+++ b/Flagsmith.Engine/Engine.cs
@@ -203,7 +203,7 @@ private static bool ContextMatchesCondition<_, __>(EvaluationContext<_, __> cont
 
                     if (contextValue != null)
                         objectIds = new List<string> { segmentKey, contextValue.ToString() };
-                    else if (context.Identity?.Key != null)
+                    else if (string.IsNullOrEmpty(condition.Property) && context.Identity?.Key != null)
                         objectIds = new List<string> { segmentKey, context.Identity.Key };
                     else
                         return false;
diff --git a/Flagsmith.EngineTest/EngineTest.cs b/Flagsmith.EngineTest/EngineTest.cs
index c31135c..15543fd 100644
--- a/Flagsmith.EngineTest/EngineTest.cs
+++ b/Flagsmith.EngineTest/EngineTest.cs
@@ -49,7 +49,7 @@ public void Test_Engine(String testCaseFilename)
             var result = _iengine.GetEvaluationResult(testCase.Context);
 
             // Then
-            Assert.Equivalent(testCase.Result, result);
+            Assert.Equivalent(testCase.Result, result, strict: true);
         }
 
         public static IEnumerable<object[]> ExtractTestCaseFilenames()
diff --git a/Flagsmith.EngineTest/EngineTestData b/Flagsmith.EngineTest/EngineTestData
index 0d9040a..7840a13 160000
--- a/Flagsmith.EngineTest/EngineTestData
+++ b/Flagsmith.EngineTest/EngineTestData
@@ -1 +1 @@
-Subproject commit 0d9040a76ec3d11f5524ca98b19ec66f8ba7daac
+Subproject commit 7840a1349b601df3b6b4a089f40864f659801afb