diff --git a/BasicUnitTest/SecurityEventTokenTests.cs b/BasicUnitTest/SecurityEventTokenTests.cs
index 09fce920c718d9fcd65767072f87152924734748..9482e14ae2b6a55557a26c34a8f2a0035f624ee7 100644
--- a/BasicUnitTest/SecurityEventTokenTests.cs
+++ b/BasicUnitTest/SecurityEventTokenTests.cs
@@ -26,6 +26,7 @@ public class SecurityEventTokenTests {
         _encryption = new FitEncryption(container.Resolve<KeySet>(), null);
     }
 
+    private FitEncryption _encryption = null!;
 
     [Test]
     public void CreateJwt_AcceptSubmission() {
@@ -139,7 +140,7 @@ public class SecurityEventTokenTests {
         var token = _encryption.CreateSecurityEventToken(Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
             Guid.NewGuid().ToString(),
-            rejectSubmission,
+     
             new[] { new Problems() { Description = "A real big issue" } }
         );
         Console.WriteLine(token);
diff --git a/E2ETest/EndToEndTestBase.cs b/E2ETest/EndToEndTestBase.cs
index d4bd425041264b583e5895cf9a3288c9e740cb86..1c462b5bc144c42666fb53dfa18a3b6f400f4269 100644
--- a/E2ETest/EndToEndTestBase.cs
+++ b/E2ETest/EndToEndTestBase.cs
@@ -9,6 +9,8 @@ using MockContainer;
 namespace E2ETest;
 
 public abstract class EndToEndTestBase {
+    protected ISender Sender = null!;
+    protected ISubscriber Subscriber = null!;
     protected ILogger Logger = null!;
     protected ISender Sender = null!;
     protected MockSettings Settings = null!;
diff --git a/FitConnect/FitConnect.csproj b/FitConnect/FitConnect.csproj
index c4077619411f1911413c68b3bb5023ffd09bc28a..cf6820bd9deb4af35c3b271f8f57b0f58f867ab7 100644
--- a/FitConnect/FitConnect.csproj
+++ b/FitConnect/FitConnect.csproj
@@ -27,6 +27,8 @@
     <ItemGroup>
         <None Remove="metadata.schema.json" />
         <EmbeddedResource Include="metadata.schema.json" />
+        <Compile Remove="Properties\AssemblyInfo.cs" />
+        <None Include="Properties\AssemblyInfo.cs" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/FitConnect/Models/FitConnectEnvironment.cs b/FitConnect/Models/FitConnectEnvironment.cs
index b6d6972d8cc6ecfe62a5af36fdfeea8896faee25..104a1e0fc67c567ddb7974318c6b7ee0480656c9 100644
--- a/FitConnect/Models/FitConnectEnvironment.cs
+++ b/FitConnect/Models/FitConnectEnvironment.cs
@@ -1,11 +1,5 @@
 namespace FitConnect.Models;
 
-// public enum FitConnectEnvironment {
-//     Development,
-//     Testing,
-//     Production
-// }
-
 public class FitConnectEnvironment {
 
     public static readonly FitConnectEnvironment Testing = new(
diff --git a/FitConnect/Models/SecurityEventToken.cs b/FitConnect/Models/SecurityEventToken.cs
index 94fba7ac5a4a94f5e7b5b6e7ac6243e42c4ba7c8..d267ef584fa602626e260584e934e46b12294ab0 100644
--- a/FitConnect/Models/SecurityEventToken.cs
+++ b/FitConnect/Models/SecurityEventToken.cs
@@ -80,7 +80,7 @@ public class SecurityEventToken {
         if (eventsClaim.Value.Contains(
                 ForwardSubmissionSchema))
             return EventType.Forward;
-        if (eventsClaim.Value.Contains(
+        if (eventsClaim.Value.Contains(Reject)) {
                 RejectSubmissionSchema)) {
             Problems = GetProblems(events?.Values?.FirstOrDefault()?.ToString() ?? "");
             return EventType.Reject;