diff --git a/NatsDotNet.slnx b/NatsDotNet.slnx
index a502fae..21823e5 100644
--- a/NatsDotNet.slnx
+++ b/NatsDotNet.slnx
@@ -14,6 +14,7 @@
+
diff --git a/src/NATS.Server/NATS.Server.csproj b/src/NATS.Server/NATS.Server.csproj
index e2c99cc..961c56e 100644
--- a/src/NATS.Server/NATS.Server.csproj
+++ b/src/NATS.Server/NATS.Server.csproj
@@ -9,6 +9,7 @@
+
diff --git a/tests/NATS.Server.Tests/ClusterJetStreamConfigProcessorTests.cs b/tests/NATS.Server.JetStream.Tests/ClusterJetStreamConfigProcessorTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/ClusterJetStreamConfigProcessorTests.cs
rename to tests/NATS.Server.JetStream.Tests/ClusterJetStreamConfigProcessorTests.cs
index dba2216..3b0e66e 100644
--- a/tests/NATS.Server.Tests/ClusterJetStreamConfigProcessorTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/ClusterJetStreamConfigProcessorTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.Configuration;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class ClusterJetStreamConfigProcessorTests
{
diff --git a/tests/NATS.Server.Tests/FileStoreEncryptionTests.cs b/tests/NATS.Server.JetStream.Tests/FileStoreEncryptionTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/FileStoreEncryptionTests.cs
rename to tests/NATS.Server.JetStream.Tests/FileStoreEncryptionTests.cs
index fd0a22d..46e3137 100644
--- a/tests/NATS.Server.Tests/FileStoreEncryptionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/FileStoreEncryptionTests.cs
@@ -5,7 +5,7 @@
using System.Security.Cryptography;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class FileStoreEncryptionTests
{
diff --git a/tests/NATS.Server.Tests/FileStoreTests.cs b/tests/NATS.Server.JetStream.Tests/FileStoreTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/FileStoreTests.cs
rename to tests/NATS.Server.JetStream.Tests/FileStoreTests.cs
index 625be3d..7ca58f3 100644
--- a/tests/NATS.Server.Tests/FileStoreTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/FileStoreTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class FileStoreTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/AdvisoryEventTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/AdvisoryEventTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/AdvisoryEventTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/AdvisoryEventTests.cs
index 5ce70cf..9926539 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/AdvisoryEventTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/AdvisoryEventTests.cs
@@ -4,7 +4,7 @@
using NATS.Server.Events;
using NATS.Server.JetStream.Api;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class AdvisoryEventTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/ApiEndpointParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ApiEndpointParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/ApiEndpointParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/ApiEndpointParityTests.cs
index 6935f2d..f1ec3b1 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/ApiEndpointParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ApiEndpointParityTests.cs
@@ -4,7 +4,7 @@ using NATS.Server.TestUtilities;
// Covers create/info/update/delete for streams, create/info/list/delete for consumers,
// direct-get access, account info, and 404 routing for unknown subjects.
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class ApiEndpointParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/ApiRateLimiterTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ApiRateLimiterTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/ApiRateLimiterTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/ApiRateLimiterTests.cs
index 94da3a5..2fe16a4 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/ApiRateLimiterTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ApiRateLimiterTests.cs
@@ -3,10 +3,9 @@
// The Go server uses a configurable semaphore (default 256) to throttle concurrent API
// requests, and caches responses for duplicate request IDs within a TTL window.
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
using NATS.Server.JetStream.Api;
-using NATS.Server.Tests;
public class ApiRateLimiterTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/ClusteredApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ClusteredApiTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/ClusteredApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/ClusteredApiTests.cs
index 10a1fee..5a5580d 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/ClusteredApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ClusteredApiTests.cs
@@ -5,7 +5,7 @@ using System.Text;
using NATS.Server.JetStream.Api.Handlers;
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class ClusteredApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/ClusteredRequestTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ClusteredRequestTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/ClusteredRequestTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/ClusteredRequestTests.cs
index 76bd25f..302e3cd 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/ClusteredRequestTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ClusteredRequestTests.cs
@@ -5,7 +5,7 @@
using NATS.Server.JetStream.Api;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class ClusteredRequestTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/ConsumerPauseApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ConsumerPauseApiTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/ConsumerPauseApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/ConsumerPauseApiTests.cs
index 32cde69..c5b9f2c 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/ConsumerPauseApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/ConsumerPauseApiTests.cs
@@ -5,7 +5,7 @@
using NATS.Server.JetStream.Api;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class ConsumerPauseApiTests : IAsyncLifetime
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/JetStreamApiLimitsParityBatch1Tests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/JetStreamApiLimitsParityBatch1Tests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Api/JetStreamApiLimitsParityBatch1Tests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/JetStreamApiLimitsParityBatch1Tests.cs
index fa1a4bc..4d470b1 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/JetStreamApiLimitsParityBatch1Tests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/JetStreamApiLimitsParityBatch1Tests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
using NATS.Server.JetStream;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class JetStreamApiLimitsParityBatch1Tests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/LeaderForwardingTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/LeaderForwardingTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/LeaderForwardingTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/LeaderForwardingTests.cs
index fe9311f..5087f9c 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/LeaderForwardingTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/LeaderForwardingTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
///
/// Simple test double for ILeaderForwarder.
diff --git a/tests/NATS.Server.Tests/JetStream/Api/SnapshotApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/SnapshotApiTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/SnapshotApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/SnapshotApiTests.cs
index a720cb9..248d66a 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/SnapshotApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/SnapshotApiTests.cs
@@ -9,7 +9,7 @@ using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Api.Handlers;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class SnapshotApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Api/StreamPurgeOptionsTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Api/StreamPurgeOptionsTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Api/StreamPurgeOptionsTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Api/StreamPurgeOptionsTests.cs
index afd0942..5dad4ce 100644
--- a/tests/NATS.Server.Tests/JetStream/Api/StreamPurgeOptionsTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Api/StreamPurgeOptionsTests.cs
@@ -6,7 +6,7 @@ using System.Text;
using NATS.Server.JetStream;
using NATS.Server.JetStream.Api;
-namespace NATS.Server.Tests.JetStream.Api;
+namespace NATS.Server.JetStream.Tests.JetStream.Api;
public class StreamPurgeOptionsTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/AssignmentCodecTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/AssignmentCodecTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/AssignmentCodecTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/AssignmentCodecTests.cs
index ac0e8d7..2c228c9 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/AssignmentCodecTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/AssignmentCodecTests.cs
@@ -2,7 +2,7 @@ using System.Text;
using System.Text.Json;
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for AssignmentCodec: binary serialization for stream and consumer assignments
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/AssignmentSerializationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/AssignmentSerializationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/AssignmentSerializationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/AssignmentSerializationTests.cs
index 1be8c9d..509c335 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/AssignmentSerializationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/AssignmentSerializationTests.cs
@@ -4,7 +4,7 @@
// Preferred peer tracking.
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for ClusterAssignmentTypes: RaftGroup quorum semantics,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/ClusterAssignmentAndPlacementTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ClusterAssignmentAndPlacementTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/ClusterAssignmentAndPlacementTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ClusterAssignmentAndPlacementTests.cs
index 6cf16cb..e3064aa 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/ClusterAssignmentAndPlacementTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ClusterAssignmentAndPlacementTests.cs
@@ -5,7 +5,7 @@
using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for B7 (ClusterAssignmentTypes), B8 (JetStreamMetaGroup proposal workflow),
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/ClusterFormationParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ClusterFormationParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/ClusterFormationParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ClusterFormationParityTests.cs
index c1a65a9..279b124 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/ClusterFormationParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ClusterFormationParityTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Go parity tests for JetStream cluster formation and multi-replica streams.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/ConsumerReplicaGroupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ConsumerReplicaGroupTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/ConsumerReplicaGroupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ConsumerReplicaGroupTests.cs
index f45a7f0..3a7756c 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/ConsumerReplicaGroupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/ConsumerReplicaGroupTests.cs
@@ -14,7 +14,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering per-consumer RAFT groups: consumer assignment, ack state
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/EntryApplicationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/EntryApplicationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/EntryApplicationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/EntryApplicationTests.cs
index c716150..b213a3b 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/EntryApplicationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/EntryApplicationTests.cs
@@ -6,7 +6,7 @@
using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for the entry application pipeline in JetStreamMetaGroup and StreamReplicaGroup.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamAssignmentProcessingTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamAssignmentProcessingTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamAssignmentProcessingTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamAssignmentProcessingTests.cs
index 5ed8cf9..8581872 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamAssignmentProcessingTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamAssignmentProcessingTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for validated stream/consumer assignment processing.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterConsumerTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterConsumerTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterConsumerTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterConsumerTests.cs
index 68ab47f..1d18fb0 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterConsumerTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterConsumerTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering clustered JetStream consumer creation, leader election,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterFailoverTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterFailoverTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterFailoverTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterFailoverTests.cs
index 6d49067..6ff97a4 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterFailoverTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterFailoverTests.cs
@@ -12,7 +12,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster failover scenarios: leader stepdown,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterFixtureTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterFixtureTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterFixtureTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterFixtureTests.cs
index a2a49b7..7e7846e 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterFixtureTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterFixtureTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Smoke tests verifying that JetStreamClusterFixture starts correctly and
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterGoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterGoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterGoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterGoParityTests.cs
index aecf524..125c829 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterGoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterGoParityTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Go-parity tests for JetStream cluster behavior. Tests cover stream and consumer
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterMetaTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterMetaTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterMetaTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterMetaTests.cs
index d43d88a..a992847 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterMetaTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterMetaTests.cs
@@ -11,7 +11,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster metadata operations: asset placement,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterMonitorTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterMonitorTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterMonitorTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterMonitorTests.cs
index 3ca4672..39ccf1a 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterMonitorTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterMonitorTests.cs
@@ -2,7 +2,7 @@ using System.Threading.Channels;
using NATS.Server.JetStream.Cluster;
using NATS.Server.Raft;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for JetStreamClusterMonitor — background meta entry processing.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterStreamTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterStreamTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterStreamTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterStreamTests.cs
index cb8d2f9..02df6a7 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamClusterStreamTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamClusterStreamTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering clustered JetStream stream creation, replication, storage,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamInflightTrackingTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamInflightTrackingTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamInflightTrackingTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamInflightTrackingTests.cs
index 96d4268..00b28ac 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamInflightTrackingTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamInflightTrackingTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
public class JetStreamInflightTrackingTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamLeadershipTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamLeadershipTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamLeadershipTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamLeadershipTests.cs
index 9e9ab16..68f6e4e 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamLeadershipTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamLeadershipTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
public class JetStreamLeadershipTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamMetaControllerTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamMetaControllerTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JetStreamMetaControllerTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamMetaControllerTests.cs
index eac7700..0c72f32 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JetStreamMetaControllerTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JetStreamMetaControllerTests.cs
@@ -12,7 +12,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream meta controller leadership, API routing through
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsCluster1GoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster1GoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsCluster1GoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster1GoParityTests.cs
index 40d1a15..4b5dfe2 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsCluster1GoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster1GoParityTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Go-parity tests for JetStream cluster batch 1: meta recovery, consumer state,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsCluster2GoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster2GoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsCluster2GoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster2GoParityTests.cs
index 0f8e7e4..fa827b7 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsCluster2GoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster2GoParityTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Go-parity tests for JetStream cluster behavior from jetstream_cluster_2_test.go.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsCluster34GoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster34GoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsCluster34GoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster34GoParityTests.cs
index bcf9483..e41820d 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsCluster34GoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsCluster34GoParityTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Go-parity tests covering scale, move, pause, lame duck, NRG cleanup,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterAdvancedTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterAdvancedTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterAdvancedTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterAdvancedTests.cs
index 42a44a8..8e24c66 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterAdvancedTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterAdvancedTests.cs
@@ -9,7 +9,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Advanced JetStream cluster tests covering high-load scenarios, large clusters,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterConsumerReplicationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterConsumerReplicationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterConsumerReplicationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterConsumerReplicationTests.cs
index abc408f..6ff5fb3 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterConsumerReplicationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterConsumerReplicationTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster consumer replication: creation basics,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterFailoverTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterFailoverTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterFailoverTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterFailoverTests.cs
index 9f4c68b..17679b1 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterFailoverTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterFailoverTests.cs
@@ -22,7 +22,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster failover scenarios: leader stepdown while
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterLeaderElectionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterLeaderElectionTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterLeaderElectionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterLeaderElectionTests.cs
index 169711c..b7a3c37 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterLeaderElectionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterLeaderElectionTests.cs
@@ -18,7 +18,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster leader election for the meta-cluster,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterLongRunningTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterLongRunningTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterLongRunningTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterLongRunningTests.cs
index dd77ce8..1ef5e9f 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterLongRunningTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterLongRunningTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Long-running JetStream cluster tests covering high-volume scenarios,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterMetaGovernanceTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterMetaGovernanceTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterMetaGovernanceTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterMetaGovernanceTests.cs
index ecf8dc4..63839a3 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterMetaGovernanceTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterMetaGovernanceTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster meta-cluster governance: meta peer count,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterStreamPlacementTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterStreamPlacementTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterStreamPlacementTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterStreamPlacementTests.cs
index 5d98570..6a4adae 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterStreamPlacementTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterStreamPlacementTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster stream placement semantics:
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterStreamReplicationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterStreamReplicationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsClusterStreamReplicationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterStreamReplicationTests.cs
index 8dcc2d8..ebecfff 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsClusterStreamReplicationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsClusterStreamReplicationTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream cluster stream replication semantics:
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/JsSuperClusterTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsSuperClusterTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/JsSuperClusterTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsSuperClusterTests.cs
index 950aec7..95e65d0 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/JsSuperClusterTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/JsSuperClusterTests.cs
@@ -15,7 +15,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Api;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Go parity tests for JetStream super-cluster (multi-cluster with gateway bridges).
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/LeaderFailoverParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/LeaderFailoverParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/LeaderFailoverParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/LeaderFailoverParityTests.cs
index 6ec9882..4a1ea73 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/LeaderFailoverParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/LeaderFailoverParityTests.cs
@@ -9,7 +9,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering JetStream leader election and failover scenarios,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/MetaGroupProposalTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/MetaGroupProposalTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/MetaGroupProposalTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/MetaGroupProposalTests.cs
index ab11571..71559e3 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/MetaGroupProposalTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/MetaGroupProposalTests.cs
@@ -6,7 +6,7 @@
using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for JetStreamMetaGroup RAFT proposal workflow.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/MetaSnapshotCodecTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/MetaSnapshotCodecTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/MetaSnapshotCodecTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/MetaSnapshotCodecTests.cs
index f3bb304..3b48858 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/MetaSnapshotCodecTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/MetaSnapshotCodecTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for MetaSnapshotCodec: encode/decode round-trip, S2 compression, versioning.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/PeerManagementTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/PeerManagementTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/PeerManagementTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/PeerManagementTests.cs
index ce570f9..4116ca6 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/PeerManagementTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/PeerManagementTests.cs
@@ -4,7 +4,7 @@
using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for JetStreamMetaGroup peer management and stream reassignment.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/PlacementEngineTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/PlacementEngineTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/PlacementEngineTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/PlacementEngineTests.cs
index 7608231..d41f07f 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/PlacementEngineTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/PlacementEngineTests.cs
@@ -4,7 +4,7 @@
// single replica selection, and combined policy filtering.
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for PlacementEngine topology-aware peer selection.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/RaftGroupLifecycleTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/RaftGroupLifecycleTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/RaftGroupLifecycleTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/RaftGroupLifecycleTests.cs
index 19cee88..cb420f1 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/RaftGroupLifecycleTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/RaftGroupLifecycleTests.cs
@@ -4,7 +4,7 @@
// and quorum size calculation.
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for RaftGroup lifecycle: membership helpers, factory method,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/StreamRaftGroupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamRaftGroupTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/StreamRaftGroupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamRaftGroupTests.cs
index f3d971e..0669b05 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/StreamRaftGroupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamRaftGroupTests.cs
@@ -4,7 +4,7 @@
// and non-leader rejection.
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for StreamReplicaGroup stream-specific RAFT apply logic:
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/StreamReplicaGroupApplyTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamReplicaGroupApplyTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/StreamReplicaGroupApplyTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamReplicaGroupApplyTests.cs
index a13bdc4..8f4e4b3 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/StreamReplicaGroupApplyTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamReplicaGroupApplyTests.cs
@@ -5,7 +5,7 @@
using NATS.Server.JetStream.Cluster;
using NATS.Server.Raft;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for B10: per-stream RAFT apply logic added to StreamReplicaGroup.
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/StreamReplicaGroupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamReplicaGroupTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/StreamReplicaGroupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamReplicaGroupTests.cs
index 350f6d8..7c7b932 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/StreamReplicaGroupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/StreamReplicaGroupTests.cs
@@ -12,7 +12,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.Raft;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests covering per-stream RAFT groups: stream assignment proposal,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/TopologyPlacementTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/TopologyPlacementTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/TopologyPlacementTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/TopologyPlacementTests.cs
index 74100b5..a7128e3 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/TopologyPlacementTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/TopologyPlacementTests.cs
@@ -2,7 +2,7 @@
// Covers: UniqueTag enforcement, HA asset limits, weighted scoring by available resources.
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for topology-aware placement: JetStreamUniqueTag enforcement,
diff --git a/tests/NATS.Server.Tests/JetStream/Cluster/UnsupportedAssetTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/UnsupportedAssetTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Cluster/UnsupportedAssetTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Cluster/UnsupportedAssetTests.cs
index 9e9c9aa..a85f34d 100644
--- a/tests/NATS.Server.Tests/JetStream/Cluster/UnsupportedAssetTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Cluster/UnsupportedAssetTests.cs
@@ -3,7 +3,7 @@
// SkippedUnsupportedEntries counter, mixed-version batch partial apply.
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream.Cluster;
+namespace NATS.Server.JetStream.Tests.JetStream.Cluster;
///
/// Tests for graceful handling of version-incompatible stream/consumer assignments
diff --git a/tests/NATS.Server.Tests/JetStream/ConsumerDeliveryParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/ConsumerDeliveryParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/ConsumerDeliveryParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/ConsumerDeliveryParityTests.cs
index 6599d70..8c96cb8 100644
--- a/tests/NATS.Server.Tests/JetStream/ConsumerDeliveryParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/ConsumerDeliveryParityTests.cs
@@ -15,7 +15,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
///
/// Consumer delivery parity tests ported from the Go reference implementation.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/AckProcessorEnhancedTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/AckProcessorEnhancedTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Consumers/AckProcessorEnhancedTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/AckProcessorEnhancedTests.cs
index de50bb2..a196c78 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/AckProcessorEnhancedTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/AckProcessorEnhancedTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for enhanced AckProcessor with RedeliveryTracker integration.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/AckProcessorNakTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/AckProcessorNakTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/AckProcessorNakTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/AckProcessorNakTests.cs
index 73e3406..9e0221c 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/AckProcessorNakTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/AckProcessorNakTests.cs
@@ -1,7 +1,7 @@
// Go: consumer.go:2550 (processAckMsg, processNak, processTerm, processAckProgress)
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class AckProcessorNakTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/ClusterPendingRequestTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ClusterPendingRequestTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/ClusterPendingRequestTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ClusterPendingRequestTests.cs
index 036e8c3..dc6021b 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/ClusterPendingRequestTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ClusterPendingRequestTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Cluster;
using Shouldly;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for cluster-aware pending pull request tracking in PullConsumerEngine.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerGoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerGoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/ConsumerGoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerGoParityTests.cs
index fd67261..217b89d 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerGoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerGoParityTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.Subscriptions;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Go parity tests ported from jetstream_consumer_test.go for consumer
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerLifecycleTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerLifecycleTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/ConsumerLifecycleTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerLifecycleTests.cs
index 36bd94b..841da5f 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerLifecycleTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerLifecycleTests.cs
@@ -13,7 +13,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Consumer lifecycle tests: pause/resume, replay, priority pull, state persistence,
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerPauseResumeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerPauseResumeTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Consumers/ConsumerPauseResumeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerPauseResumeTests.cs
index 6cf0c4e..f99bebc 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerPauseResumeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerPauseResumeTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for consumer pause/resume with auto-resume timer.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerPullQueueTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerPullQueueTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/ConsumerPullQueueTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerPullQueueTests.cs
index 11fe6cb..630fb41 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerPullQueueTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerPullQueueTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using NATS.Server.Subscriptions;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Go parity tests ported from jetstream_consumer_test.go covering pull consumer
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerResetTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerResetTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/ConsumerResetTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerResetTests.cs
index 2f75048..a8b008d 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/ConsumerResetTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/ConsumerResetTests.cs
@@ -5,7 +5,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using System.Text;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for consumer reset-to-sequence (Gap 3.12) and AckProcessor.ClearAll / SetAckFloor.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/DeliveryInterestTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/DeliveryInterestTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/DeliveryInterestTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/DeliveryInterestTests.cs
index 2742ea5..545b46b 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/DeliveryInterestTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/DeliveryInterestTests.cs
@@ -1,7 +1,7 @@
// Go: consumer.go hasDeliveryInterest, deleteNotActive
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class DeliveryInterestTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/DeliveryLoopTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/DeliveryLoopTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/DeliveryLoopTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/DeliveryLoopTests.cs
index 2994007..42fa797 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/DeliveryLoopTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/DeliveryLoopTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class DeliveryLoopTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/FilterSkipTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/FilterSkipTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/FilterSkipTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/FilterSkipTests.cs
index bab2377..083ee26 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/FilterSkipTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/FilterSkipTests.cs
@@ -3,7 +3,7 @@
// and skip sequence gap tracking.
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class FilterSkipTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/IdleHeartbeatTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/IdleHeartbeatTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/IdleHeartbeatTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/IdleHeartbeatTests.cs
index 7af49c2..d7bea28 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/IdleHeartbeatTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/IdleHeartbeatTests.cs
@@ -10,9 +10,8 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-using NATS.Server.Tests;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class IdleHeartbeatTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/MaxDeliveriesTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/MaxDeliveriesTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/MaxDeliveriesTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/MaxDeliveriesTests.cs
index d134ff2..1dffd29 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/MaxDeliveriesTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/MaxDeliveriesTests.cs
@@ -1,7 +1,7 @@
// Go: consumer.go maxDeliver config — max delivery enforcement and advisory generation
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class MaxDeliveriesTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/PriorityGroupPinningTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PriorityGroupPinningTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStream/Consumers/PriorityGroupPinningTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PriorityGroupPinningTests.cs
index b82a942..a534f18 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/PriorityGroupPinningTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PriorityGroupPinningTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for priority group pin ID management.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/PriorityGroupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PriorityGroupTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/PriorityGroupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PriorityGroupTests.cs
index 56cae30..86729f7 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/PriorityGroupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PriorityGroupTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class PriorityGroupTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/PullConsumerTimeoutTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PullConsumerTimeoutTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/PullConsumerTimeoutTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PullConsumerTimeoutTests.cs
index 04b9577..662af47 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/PullConsumerTimeoutTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PullConsumerTimeoutTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class PullConsumerTimeoutTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/PushConsumerDeliveryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PushConsumerDeliveryTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/PushConsumerDeliveryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PushConsumerDeliveryTests.cs
index 203f815..c269c46 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/PushConsumerDeliveryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/PushConsumerDeliveryTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class PushConsumerDeliveryTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/RedeliveryTrackerPriorityQueueTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/RedeliveryTrackerPriorityQueueTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Consumers/RedeliveryTrackerPriorityQueueTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/RedeliveryTrackerPriorityQueueTests.cs
index 755ab30..b6416f2 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/RedeliveryTrackerPriorityQueueTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/RedeliveryTrackerPriorityQueueTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for the new PriorityQueue-based RedeliveryTracker features.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/RedeliveryTrackerTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/RedeliveryTrackerTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/RedeliveryTrackerTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/RedeliveryTrackerTests.cs
index 013de17..4f3b009 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/RedeliveryTrackerTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/RedeliveryTrackerTests.cs
@@ -2,7 +2,7 @@
// addToRedeliverQueue, maxdeliver check)
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class RedeliveryTrackerTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/SampleModeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/SampleModeTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Consumers/SampleModeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/SampleModeTests.cs
index e0ff983..0eac89d 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/SampleModeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/SampleModeTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for SampleTracker: sample frequency parsing and stochastic latency sampling.
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/TokenBucketTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/TokenBucketTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Consumers/TokenBucketTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/TokenBucketTests.cs
index 78c2750..e1a5809 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/TokenBucketTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/TokenBucketTests.cs
@@ -1,7 +1,7 @@
// Go: consumer.go (rateLimitBps config, rate limiting in consumer delivery)
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
public class TokenBucketTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Consumers/WaitingRequestQueueTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/WaitingRequestQueueTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Consumers/WaitingRequestQueueTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Consumers/WaitingRequestQueueTests.cs
index f93e238..33acb68 100644
--- a/tests/NATS.Server.Tests/JetStream/Consumers/WaitingRequestQueueTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Consumers/WaitingRequestQueueTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests.JetStream.Consumers;
+namespace NATS.Server.JetStream.Tests.JetStream.Consumers;
///
/// Tests for WaitingRequestQueue FIFO queue with expiry and batch/byte tracking.
diff --git a/tests/NATS.Server.Tests/JetStream/InterestRetentionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/InterestRetentionTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/InterestRetentionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/InterestRetentionTests.cs
index 3b39596..aff3b5d 100644
--- a/tests/NATS.Server.Tests/JetStream/InterestRetentionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/InterestRetentionTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
///
/// Tests for InterestRetentionPolicy per-consumer ack tracking.
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamAccountLimitTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAccountLimitTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamAccountLimitTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAccountLimitTests.cs
index e1f9060..70b6653 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamAccountLimitTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAccountLimitTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamAccountLimitTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamAckRedeliveryStateMachineTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAckRedeliveryStateMachineTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStream/JetStreamAckRedeliveryStateMachineTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAckRedeliveryStateMachineTests.cs
index 52416dc..c2b0bc5 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamAckRedeliveryStateMachineTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAckRedeliveryStateMachineTests.cs
@@ -1,4 +1,4 @@
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamAckRedeliveryStateMachineTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamAdminTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAdminTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamAdminTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAdminTests.cs
index 729c6d5..2f24cfb 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamAdminTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamAdminTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamAdminTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamClusterGovernanceBehaviorParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamClusterGovernanceBehaviorParityTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStream/JetStreamClusterGovernanceBehaviorParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamClusterGovernanceBehaviorParityTests.cs
index 1c17d57..83121a9 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamClusterGovernanceBehaviorParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamClusterGovernanceBehaviorParityTests.cs
@@ -1,4 +1,4 @@
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamClusterGovernanceBehaviorParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamClusterGovernanceRuntimeParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamClusterGovernanceRuntimeParityTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStream/JetStreamClusterGovernanceRuntimeParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamClusterGovernanceRuntimeParityTests.cs
index 225237d..dfeaf02 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamClusterGovernanceRuntimeParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamClusterGovernanceRuntimeParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamClusterGovernanceRuntimeParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConfigModelParityBatch3Tests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConfigModelParityBatch3Tests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConfigModelParityBatch3Tests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConfigModelParityBatch3Tests.cs
index 027f40a..011e4cd 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConfigModelParityBatch3Tests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConfigModelParityBatch3Tests.cs
@@ -1,7 +1,7 @@
using NATS.Server.Configuration;
using NATS.Server.JetStream;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamConfigModelParityBatch3Tests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerCrudTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerCrudTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerCrudTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerCrudTests.cs
index e61eb9b..1e0fc3d 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerCrudTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerCrudTests.cs
@@ -4,7 +4,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamConsumerCrudTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerDeliverPolicyLongRunTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerDeliverPolicyLongRunTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerDeliverPolicyLongRunTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerDeliverPolicyLongRunTests.cs
index a2b27f2..ec8d4c0 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerDeliverPolicyLongRunTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerDeliverPolicyLongRunTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerDeliverPolicyLongRunTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerDeliveryEdgeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerDeliveryEdgeTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerDeliveryEdgeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerDeliveryEdgeTests.cs
index 71b1221..27d5909 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerDeliveryEdgeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerDeliveryEdgeTests.cs
@@ -6,7 +6,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamConsumerDeliveryEdgeTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerFeatureTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerFeatureTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerFeatureTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerFeatureTests.cs
index 40457b6..7310bae 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerFeatureTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerFeatureTests.cs
@@ -6,7 +6,7 @@ using System.Text;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamConsumerFeatureTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerFlowReplayParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerFlowReplayParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerFlowReplayParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerFlowReplayParityTests.cs
index f00e382..1db7183 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerFlowReplayParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerFlowReplayParityTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using NATS.Server.JetStream;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerFlowReplayParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerRuntimeParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerRuntimeParityTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerRuntimeParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerRuntimeParityTests.cs
index 1fef930..b5135dc 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerRuntimeParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerRuntimeParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Consumers;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerRuntimeParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerStateMachineStrictParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerStateMachineStrictParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamConsumerStateMachineStrictParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerStateMachineStrictParityTests.cs
index 31f94b3..bdefead 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamConsumerStateMachineStrictParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamConsumerStateMachineStrictParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamConsumerStateMachineStrictParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamCrossClusterBehaviorParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamCrossClusterBehaviorParityTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStream/JetStreamCrossClusterBehaviorParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamCrossClusterBehaviorParityTests.cs
index 2044d6f..c4808eb 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamCrossClusterBehaviorParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamCrossClusterBehaviorParityTests.cs
@@ -1,4 +1,4 @@
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamCrossClusterBehaviorParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamCrossClusterRuntimeParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamCrossClusterRuntimeParityTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStream/JetStreamCrossClusterRuntimeParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamCrossClusterRuntimeParityTests.cs
index 0cd1630..20fbfc6 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamCrossClusterRuntimeParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamCrossClusterRuntimeParityTests.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using NATS.Server.Configuration;
using NATS.Server.Gateways;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamCrossClusterRuntimeParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamDedupeWindowParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamDedupeWindowParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamDedupeWindowParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamDedupeWindowParityTests.cs
index 2f4c130..8152078 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamDedupeWindowParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamDedupeWindowParityTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamDedupeWindowParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamDirectGetTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamDirectGetTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamDirectGetTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamDirectGetTests.cs
index 07fa40c..23c7eeb 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamDirectGetTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamDirectGetTests.cs
@@ -5,7 +5,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamDirectGetTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreCompressionEncryptionParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreCompressionEncryptionParityTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFileStoreCompressionEncryptionParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreCompressionEncryptionParityTests.cs
index 812f9cf..f3cf192 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreCompressionEncryptionParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreCompressionEncryptionParityTests.cs
@@ -1,7 +1,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFileStoreCompressionEncryptionParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreCryptoCompressionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreCryptoCompressionTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFileStoreCryptoCompressionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreCryptoCompressionTests.cs
index 32fa9a2..20544b2 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreCryptoCompressionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreCryptoCompressionTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFileStoreCryptoCompressionTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreDurabilityParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreDurabilityParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFileStoreDurabilityParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreDurabilityParityTests.cs
index cd95bf2..82e88b1 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreDurabilityParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreDurabilityParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Storage;
using System.Text;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFileStoreDurabilityParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreInvariantTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreInvariantTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFileStoreInvariantTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreInvariantTests.cs
index d4fb4d7..a201e58 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreInvariantTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreInvariantTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamFileStoreInvariantTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreLayoutParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreLayoutParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFileStoreLayoutParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreLayoutParityTests.cs
index e170ba0..be10ca6 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreLayoutParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreLayoutParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFileStoreLayoutParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreRecoveryStrictParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreRecoveryStrictParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFileStoreRecoveryStrictParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreRecoveryStrictParityTests.cs
index 6829bdc..9508626 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFileStoreRecoveryStrictParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFileStoreRecoveryStrictParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamFileStoreRecoveryStrictParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamFlowControlReplayTimingTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFlowControlReplayTimingTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStream/JetStreamFlowControlReplayTimingTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFlowControlReplayTimingTests.cs
index 968fb50..42a5a9a 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamFlowControlReplayTimingTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamFlowControlReplayTimingTests.cs
@@ -1,4 +1,4 @@
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFlowControlReplayTimingTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamGoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamGoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamGoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamGoParityTests.cs
index 483ddad..b10f3d8 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamGoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamGoParityTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
///
/// Go parity tests ported from jetstream_test.go for core JetStream behaviors
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamMetaGovernanceStrictParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMetaGovernanceStrictParityTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStream/JetStreamMetaGovernanceStrictParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMetaGovernanceStrictParityTests.cs
index 59686b1..137cfcf 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamMetaGovernanceStrictParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMetaGovernanceStrictParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamMetaGovernanceStrictParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamMirrorSourceRuntimeParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMirrorSourceRuntimeParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamMirrorSourceRuntimeParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMirrorSourceRuntimeParityTests.cs
index 6efe0c4..6cd0c7e 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamMirrorSourceRuntimeParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMirrorSourceRuntimeParityTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream.MirrorSource;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamMirrorSourceRuntimeParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamMirrorSourceStrictRuntimeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMirrorSourceStrictRuntimeTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStream/JetStreamMirrorSourceStrictRuntimeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMirrorSourceStrictRuntimeTests.cs
index dd58e9a..344795f 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamMirrorSourceStrictRuntimeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamMirrorSourceStrictRuntimeTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream.MirrorSource;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamMirrorSourceStrictRuntimeTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamPubSubTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamPubSubTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamPubSubTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamPubSubTests.cs
index 728c16e..532d4e1 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamPubSubTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamPubSubTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamPubSubTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamPublishPreconditionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamPublishPreconditionTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamPublishPreconditionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamPublishPreconditionTests.cs
index c404bff..e051f20 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamPublishPreconditionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamPublishPreconditionTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamPublishPreconditionTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamReplicaGovernanceStrictParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamReplicaGovernanceStrictParityTests.cs
similarity index 91%
rename from tests/NATS.Server.Tests/JetStream/JetStreamReplicaGovernanceStrictParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamReplicaGovernanceStrictParityTests.cs
index b2e8da8..66302ac 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamReplicaGovernanceStrictParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamReplicaGovernanceStrictParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamReplicaGovernanceStrictParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamRetentionRuntimeParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamRetentionRuntimeParityTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/JetStreamRetentionRuntimeParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamRetentionRuntimeParityTests.cs
index c2eabbb..1541004 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamRetentionRuntimeParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamRetentionRuntimeParityTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamRetentionRuntimeParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamRetentionRuntimeStrictParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamRetentionRuntimeStrictParityTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStream/JetStreamRetentionRuntimeStrictParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamRetentionRuntimeStrictParityTests.cs
index b968ddf..5c9f20c 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamRetentionRuntimeStrictParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamRetentionRuntimeStrictParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamRetentionRuntimeStrictParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamServerConfigParityBatch2Tests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamServerConfigParityBatch2Tests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/JetStreamServerConfigParityBatch2Tests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamServerConfigParityBatch2Tests.cs
index e49b4dc..c16a8cf 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamServerConfigParityBatch2Tests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamServerConfigParityBatch2Tests.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using NATS.Server.Configuration;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamServerConfigParityBatch2Tests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamServiceOrchestrationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamServiceOrchestrationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamServiceOrchestrationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamServiceOrchestrationTests.cs
index 352a218..e6e6625 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamServiceOrchestrationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamServiceOrchestrationTests.cs
@@ -5,7 +5,7 @@
using NATS.Server.Configuration;
using NATS.Server.JetStream;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public sealed class JetStreamServiceOrchestrationTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamStreamCrudTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamCrudTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamStreamCrudTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamCrudTests.cs
index 89473f0..67ffc78 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamStreamCrudTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamCrudTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamStreamCrudTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamStreamEdgeCaseTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamEdgeCaseTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamStreamEdgeCaseTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamEdgeCaseTests.cs
index e1e3dc3..619a024 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamStreamEdgeCaseTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamEdgeCaseTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamStreamEdgeCaseTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamStreamFeatureTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamFeatureTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JetStreamStreamFeatureTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamFeatureTests.cs
index f25db8e..d19d3aa 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamStreamFeatureTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamFeatureTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JetStreamStreamFeatureTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamStreamFeatureToggleParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamFeatureToggleParityTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStream/JetStreamStreamFeatureToggleParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamFeatureToggleParityTests.cs
index 3472039..f0f4997 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamStreamFeatureToggleParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamFeatureToggleParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamFeatureToggleParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamStreamRuntimeParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamRuntimeParityTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStream/JetStreamStreamRuntimeParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamRuntimeParityTests.cs
index 5efc97e..d1225e3 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamStreamRuntimeParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamRuntimeParityTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamRuntimeParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JetStreamStreamRuntimePolicyLongRunTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamRuntimePolicyLongRunTests.cs
similarity index 90%
rename from tests/NATS.Server.Tests/JetStream/JetStreamStreamRuntimePolicyLongRunTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamRuntimePolicyLongRunTests.cs
index 7544131..cc1cf99 100644
--- a/tests/NATS.Server.Tests/JetStream/JetStreamStreamRuntimePolicyLongRunTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JetStreamStreamRuntimePolicyLongRunTests.cs
@@ -1,4 +1,4 @@
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamRuntimePolicyLongRunTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JsBatchingTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JsBatchingTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JsBatchingTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JsBatchingTests.cs
index 9abb338..d7b2e9b 100644
--- a/tests/NATS.Server.Tests/JetStream/JsBatchingTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JsBatchingTests.cs
@@ -10,7 +10,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
///
/// Go-parity tests for atomic batch publish (Nats-Batch-Id / Nats-Batch-Sequence /
diff --git a/tests/NATS.Server.Tests/JetStream/JsConfigLimitsTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JsConfigLimitsTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JsConfigLimitsTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JsConfigLimitsTests.cs
index 47daa22..77a84c6 100644
--- a/tests/NATS.Server.Tests/JetStream/JsConfigLimitsTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JsConfigLimitsTests.cs
@@ -11,7 +11,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
///
/// Go parity tests ported from jetstream_test.go covering config/limits/validation
diff --git a/tests/NATS.Server.Tests/JetStream/JsDeliveryAckTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JsDeliveryAckTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JsDeliveryAckTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JsDeliveryAckTests.cs
index ac3cd5d..e8f587f 100644
--- a/tests/NATS.Server.Tests/JetStream/JsDeliveryAckTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JsDeliveryAckTests.cs
@@ -8,7 +8,7 @@ using NATS.Server.JetStream.Consumers;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class JsDeliveryAckTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/JsStorageRecoveryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JsStorageRecoveryTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JsStorageRecoveryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JsStorageRecoveryTests.cs
index 7575348..c329fcd 100644
--- a/tests/NATS.Server.Tests/JetStream/JsStorageRecoveryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JsStorageRecoveryTests.cs
@@ -13,7 +13,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public sealed class JsStorageRecoveryTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/JsVersioningTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/JsVersioningTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/JsVersioningTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/JsVersioningTests.cs
index e8af61e..9c7c117 100644
--- a/tests/NATS.Server.Tests/JetStream/JsVersioningTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/JsVersioningTests.cs
@@ -16,7 +16,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
///
/// Go parity tests for JetStream versioning metadata logic and direct-get batch behavior.
diff --git a/tests/NATS.Server.Tests/JetStream/MirrorSource/MirrorSyncTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/MirrorSource/MirrorSyncTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/MirrorSource/MirrorSyncTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/MirrorSource/MirrorSyncTests.cs
index c04e180..654ab52 100644
--- a/tests/NATS.Server.Tests/JetStream/MirrorSource/MirrorSyncTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/MirrorSource/MirrorSyncTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.MirrorSource;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.MirrorSource;
+namespace NATS.Server.JetStream.Tests.JetStream.MirrorSource;
// Go reference: server/stream.go:2788-2854 (processMirrorMsgs)
// Go reference: server/stream.go:2863-3014 (processInboundMirrorMsg)
diff --git a/tests/NATS.Server.Tests/JetStream/MirrorSource/SourceFilterTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/MirrorSource/SourceFilterTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/MirrorSource/SourceFilterTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/MirrorSource/SourceFilterTests.cs
index 05b0716..81c1f3f 100644
--- a/tests/NATS.Server.Tests/JetStream/MirrorSource/SourceFilterTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/MirrorSource/SourceFilterTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream.MirrorSource;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.MirrorSource;
+namespace NATS.Server.JetStream.Tests.JetStream.MirrorSource;
// Go reference: server/stream.go:3860-4007 (processInboundSourceMsg)
// Go reference: server/stream.go:3474-3720 (setupSourceConsumer, trySetupSourceConsumer)
diff --git a/tests/NATS.Server.Tests/JetStream/MirrorSourceGoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/MirrorSourceGoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/MirrorSourceGoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/MirrorSourceGoParityTests.cs
index 311e5ec..dd182a2 100644
--- a/tests/NATS.Server.Tests/JetStream/MirrorSourceGoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/MirrorSourceGoParityTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream.MirrorSource;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
// Go reference: server/jetstream_test.go — Mirror, Source & Transform parity tests
// Each test documents the Go function name and line number it ports.
diff --git a/tests/NATS.Server.Tests/JetStream/PublishAckParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/PublishAckParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/PublishAckParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/PublishAckParityTests.cs
index 1280726..7d6c8e0 100644
--- a/tests/NATS.Server.Tests/JetStream/PublishAckParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/PublishAckParityTests.cs
@@ -6,7 +6,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class PublishAckParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/RetentionPolicyParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/RetentionPolicyParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/RetentionPolicyParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/RetentionPolicyParityTests.cs
index 989b978..624fde8 100644
--- a/tests/NATS.Server.Tests/JetStream/RetentionPolicyParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/RetentionPolicyParityTests.cs
@@ -11,7 +11,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests.JetStream;
+namespace NATS.Server.JetStream.Tests.JetStream;
public class RetentionPolicyParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Snapshots/StreamSnapshotTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Snapshots/StreamSnapshotTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Snapshots/StreamSnapshotTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Snapshots/StreamSnapshotTests.cs
index 1b06f7e..327735f 100644
--- a/tests/NATS.Server.Tests/JetStream/Snapshots/StreamSnapshotTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Snapshots/StreamSnapshotTests.cs
@@ -11,7 +11,7 @@ using NATS.Server.JetStream.Snapshots;
using NATS.Server.JetStream.Storage;
using Shouldly;
-namespace NATS.Server.Tests.JetStream.Snapshots;
+namespace NATS.Server.JetStream.Tests.JetStream.Snapshots;
public sealed class StreamSnapshotTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/AeadEncryptorTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/AeadEncryptorTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/AeadEncryptorTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/AeadEncryptorTests.cs
index ed80da0..b9544f9 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/AeadEncryptorTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/AeadEncryptorTests.cs
@@ -7,7 +7,7 @@
using System.Security.Cryptography;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class AeadEncryptorTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/AtomicFileWriterTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/AtomicFileWriterTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Storage/AtomicFileWriterTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/AtomicFileWriterTests.cs
index 8cb7735..e7c1ca4 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/AtomicFileWriterTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/AtomicFileWriterTests.cs
@@ -4,7 +4,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class AtomicFileWriterTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreBasicTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreBasicTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreBasicTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreBasicTests.cs
index dcc8ddb..9be6f8d 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreBasicTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreBasicTests.cs
@@ -13,7 +13,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreBasicTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreBlockTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreBlockTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreBlockTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreBlockTests.cs
index a59931e..941bdbd 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreBlockTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreBlockTests.cs
@@ -7,7 +7,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreBlockTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreChecksumTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreChecksumTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreChecksumTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreChecksumTests.cs
index f8cbce6..60ea2eb 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreChecksumTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreChecksumTests.cs
@@ -6,7 +6,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreChecksumTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreCompressionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreCompressionTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreCompressionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreCompressionTests.cs
index 6ff7f8a..d13a041 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreCompressionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreCompressionTests.cs
@@ -9,7 +9,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreCompressionTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreCrashRecoveryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreCrashRecoveryTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreCrashRecoveryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreCrashRecoveryTests.cs
index d1e6cc0..a7938f6 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreCrashRecoveryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreCrashRecoveryTests.cs
@@ -10,7 +10,7 @@ using System.Text;
using System.Text.Json;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Tests for and stream state checkpoint writes.
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreEncryptionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreEncryptionTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreEncryptionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreEncryptionTests.cs
index 3d91b48..1627cc3 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreEncryptionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreEncryptionTests.cs
@@ -8,7 +8,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreEncryptionTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreFilterQueryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreFilterQueryTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreFilterQueryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreFilterQueryTests.cs
index b79c0fe..e255b69 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreFilterQueryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreFilterQueryTests.cs
@@ -13,7 +13,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreFilterQueryTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreGoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreGoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreGoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreGoParityTests.cs
index 98dfcf5..ec77810 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreGoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreGoParityTests.cs
@@ -27,7 +27,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Go FileStore parity tests. Each test mirrors a specific Go test from
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreLimitsTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreLimitsTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreLimitsTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreLimitsTests.cs
index 58dc2d2..1099a24 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreLimitsTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreLimitsTests.cs
@@ -8,7 +8,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreLimitsTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStorePermutationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePermutationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStorePermutationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePermutationTests.cs
index a98280f..6873937 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStorePermutationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePermutationTests.cs
@@ -26,7 +26,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStorePermutationTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStorePurgeBlockTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePurgeBlockTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStorePurgeBlockTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePurgeBlockTests.cs
index ee24b5c..6e78547 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStorePurgeBlockTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePurgeBlockTests.cs
@@ -7,7 +7,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Tests for FileStore tombstone tracking and purge operations:
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStorePurgeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePurgeTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStorePurgeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePurgeTests.cs
index e74b0a9..464db7d 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStorePurgeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStorePurgeTests.cs
@@ -8,7 +8,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStorePurgeTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreRecovery2Tests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreRecovery2Tests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreRecovery2Tests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreRecovery2Tests.cs
index b3a7847..9c7775c 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreRecovery2Tests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreRecovery2Tests.cs
@@ -39,7 +39,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Go FileStore parity tests — T1: Block Recovery and Compaction.
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreRecoveryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreRecoveryTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreRecoveryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreRecoveryTests.cs
index 8361e1c..f34bff2 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreRecoveryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreRecoveryTests.cs
@@ -11,7 +11,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreRecoveryTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreStreamStoreTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreStreamStoreTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreStreamStoreTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreStreamStoreTests.cs
index 751d1ef..26d9cb3 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreStreamStoreTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreStreamStoreTests.cs
@@ -8,7 +8,7 @@
using NATS.Server.JetStream.Storage;
using StorageType = NATS.Server.JetStream.Models.StorageType;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Tests for IStreamStore methods added to FileStore in Batch 1:
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreSubjectTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreSubjectTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreSubjectTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreSubjectTests.cs
index d313d7d..439acee 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreSubjectTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreSubjectTests.cs
@@ -13,7 +13,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreSubjectTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreTombstoneTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTombstoneTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreTombstoneTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTombstoneTests.cs
index 41498db..19c8e1b 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreTombstoneTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTombstoneTests.cs
@@ -26,7 +26,7 @@ using System.Text;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Go FileStore tombstone, deletion, TTL, and consumer state parity tests.
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreTombstoneTrackingTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTombstoneTrackingTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreTombstoneTrackingTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTombstoneTrackingTests.cs
index 4329265..c756f6e 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreTombstoneTrackingTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTombstoneTrackingTests.cs
@@ -16,7 +16,7 @@ using System.Security.Cryptography;
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Tests for SequenceSet-backed deletion tracking and secure erase in MsgBlock.
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreTtlTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTtlTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreTtlTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTtlTests.cs
index f1b6405..d3ad5b9 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreTtlTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreTtlTests.cs
@@ -11,7 +11,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Tests for the MsgBlock write cache and FileStore TTL wheel scheduling.
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreV2Tests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreV2Tests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/FileStoreV2Tests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreV2Tests.cs
index f1a28c5..0d9ac20 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/FileStoreV2Tests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/FileStoreV2Tests.cs
@@ -11,7 +11,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class FileStoreV2Tests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/MemStoreBasicTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreBasicTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/MemStoreBasicTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreBasicTests.cs
index dd83a08..8269e14 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/MemStoreBasicTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreBasicTests.cs
@@ -5,7 +5,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public class MemStoreBasicTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/MemStoreGoParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreGoParityTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/MemStoreGoParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreGoParityTests.cs
index 1b82e8e..ab9ba2a 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/MemStoreGoParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreGoParityTests.cs
@@ -30,7 +30,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Go MemStore parity tests. Each test mirrors a specific Go test from
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/MemStoreTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/MemStoreTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreTests.cs
index f0951c3..893c551 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/MemStoreTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MemStoreTests.cs
@@ -8,7 +8,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class MemStoreTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/MessageRecordTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MessageRecordTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/MessageRecordTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/MessageRecordTests.cs
index 3c0798f..81a96fc 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/MessageRecordTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MessageRecordTests.cs
@@ -10,7 +10,7 @@
using NATS.Server.JetStream.Storage;
using System.Text;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class MessageRecordTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/MsgBlockTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MsgBlockTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/MsgBlockTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/MsgBlockTests.cs
index 6780c14..839bb96 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/MsgBlockTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/MsgBlockTests.cs
@@ -9,7 +9,7 @@
using System.Text;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class MsgBlockTests : IDisposable
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/S2CodecTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/S2CodecTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStream/Storage/S2CodecTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/S2CodecTests.cs
index f6b8a81..54b3d61 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/S2CodecTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/S2CodecTests.cs
@@ -7,7 +7,7 @@
using NATS.Server.JetStream.Storage;
using System.Text;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public sealed class S2CodecTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/SequenceSetTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/SequenceSetTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/SequenceSetTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/SequenceSetTests.cs
index 7639dea..33f177c 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/SequenceSetTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/SequenceSetTests.cs
@@ -9,7 +9,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Unit tests for — the range-compressed sorted set
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/StorageRetentionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/StorageRetentionTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/StorageRetentionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/StorageRetentionTests.cs
index b11464b..1c22f53 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/StorageRetentionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/StorageRetentionTests.cs
@@ -10,7 +10,7 @@ using System.Text;
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
public class StorageRetentionTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/StoreInterfaceTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/StoreInterfaceTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/StoreInterfaceTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/StoreInterfaceTests.cs
index a48aa98..df19f77 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/StoreInterfaceTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/StoreInterfaceTests.cs
@@ -15,7 +15,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// IStreamStore interface contract tests. Validates behaviour shared by all store
diff --git a/tests/NATS.Server.Tests/JetStream/Storage/WriteCacheTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/WriteCacheTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Storage/WriteCacheTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Storage/WriteCacheTests.cs
index 9655b75..0eabe61 100644
--- a/tests/NATS.Server.Tests/JetStream/Storage/WriteCacheTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Storage/WriteCacheTests.cs
@@ -7,7 +7,7 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests.JetStream.Storage;
+namespace NATS.Server.JetStream.Tests.JetStream.Storage;
///
/// Tests for . Uses direct access to the
diff --git a/tests/NATS.Server.Tests/JetStream/StreamLifecycleTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/StreamLifecycleTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/StreamLifecycleTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/StreamLifecycleTests.cs
index 2afd371..ee9a4d0 100644
--- a/tests/NATS.Server.Tests/JetStream/StreamLifecycleTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/StreamLifecycleTests.cs
@@ -4,7 +4,7 @@ using NATS.Server.TestUtilities;
// Reference Go tests: TestJetStreamAddStream, TestJetStreamAddStreamSameConfigOK,
// TestJetStreamUpdateStream, TestJetStreamStreamPurge, TestJetStreamDeleteMsg
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class StreamLifecycleTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Streams/ConfigUpdateValidationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Streams/ConfigUpdateValidationTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Streams/ConfigUpdateValidationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Streams/ConfigUpdateValidationTests.cs
index 10b484a..ec6a13d 100644
--- a/tests/NATS.Server.Tests/JetStream/Streams/ConfigUpdateValidationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Streams/ConfigUpdateValidationTests.cs
@@ -7,7 +7,7 @@ using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Models;
using Shouldly;
-namespace NATS.Server.Tests.JetStream.Streams;
+namespace NATS.Server.JetStream.Tests.JetStream.Streams;
public class ConfigUpdateValidationTests
{
diff --git a/tests/NATS.Server.Tests/JetStream/Streams/SourceConsumerSetupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Streams/SourceConsumerSetupTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Streams/SourceConsumerSetupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Streams/SourceConsumerSetupTests.cs
index c88ac6e..b42804a 100644
--- a/tests/NATS.Server.Tests/JetStream/Streams/SourceConsumerSetupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Streams/SourceConsumerSetupTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using Shouldly;
-namespace NATS.Server.Tests.JetStream.Streams;
+namespace NATS.Server.JetStream.Tests.JetStream.Streams;
// Go reference: server/stream.go:3474-3720 (setupSourceConsumer, trySetupSourceConsumer)
// Go reference: server/stream.go:3531 ($JS.API.CONSUMER.CREATE.{sourceName})
diff --git a/tests/NATS.Server.Tests/JetStream/Streams/SourceMirrorInfoTests.cs b/tests/NATS.Server.JetStream.Tests/JetStream/Streams/SourceMirrorInfoTests.cs
similarity index 99%
rename from tests/NATS.Server.Tests/JetStream/Streams/SourceMirrorInfoTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStream/Streams/SourceMirrorInfoTests.cs
index a47c96d..1417b66 100644
--- a/tests/NATS.Server.Tests/JetStream/Streams/SourceMirrorInfoTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStream/Streams/SourceMirrorInfoTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
using Shouldly;
-namespace NATS.Server.Tests.JetStream.Streams;
+namespace NATS.Server.JetStream.Tests.JetStream.Streams;
// Go reference: server/stream.go:2739-2743 (mirrorInfo building StreamSourceInfo)
// Go reference: server/stream.go:2687-2736 (sourcesInfo / StreamSourceInfo)
diff --git a/tests/NATS.Server.Tests/JetStreamAccountControlApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamAccountControlApiTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStreamAccountControlApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamAccountControlApiTests.cs
index f4c461c..bef40db 100644
--- a/tests/NATS.Server.Tests/JetStreamAccountControlApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamAccountControlApiTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Api;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamAccountControlApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamAccountInfoApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamAccountInfoApiTests.cs
similarity index 91%
rename from tests/NATS.Server.Tests/JetStreamAccountInfoApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamAccountInfoApiTests.cs
index 1d8430f..3c4b587 100644
--- a/tests/NATS.Server.Tests/JetStreamAccountInfoApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamAccountInfoApiTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Api;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamAccountInfoApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamAckRedeliveryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamAckRedeliveryTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStreamAckRedeliveryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamAckRedeliveryTests.cs
index d99e0a9..2ec493c 100644
--- a/tests/NATS.Server.Tests/JetStreamAckRedeliveryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamAckRedeliveryTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamAckRedeliveryTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamApiGapInventoryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamApiGapInventoryTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStreamApiGapInventoryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamApiGapInventoryTests.cs
index f6dc43f..f3c87f7 100644
--- a/tests/NATS.Server.Tests/JetStreamApiGapInventoryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamApiGapInventoryTests.cs
@@ -1,7 +1,7 @@
using System.Diagnostics;
using System.Text.RegularExpressions;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamApiGapInventoryTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamApiInventoryTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamApiInventoryTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamApiInventoryTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamApiInventoryTests.cs
index 5dd78a3..df183b9 100644
--- a/tests/NATS.Server.Tests/JetStreamApiInventoryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamApiInventoryTests.cs
@@ -1,6 +1,6 @@
using System.Diagnostics;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamApiInventoryTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamApiProtocolIntegrationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamApiProtocolIntegrationTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStreamApiProtocolIntegrationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamApiProtocolIntegrationTests.cs
index d4fdf98..cea1926 100644
--- a/tests/NATS.Server.Tests/JetStreamApiProtocolIntegrationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamApiProtocolIntegrationTests.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using NATS.Client.Core;
using NATS.Server.Configuration;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamApiProtocolIntegrationTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamApiRouterCoverageTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamApiRouterCoverageTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStreamApiRouterCoverageTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamApiRouterCoverageTests.cs
index 46b031f..3ad644a 100644
--- a/tests/NATS.Server.Tests/JetStreamApiRouterCoverageTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamApiRouterCoverageTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Api;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamApiRouterCoverageTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamApiRouterTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamApiRouterTests.cs
similarity index 89%
rename from tests/NATS.Server.Tests/JetStreamApiRouterTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamApiRouterTests.cs
index e046037..3fc2bed 100644
--- a/tests/NATS.Server.Tests/JetStreamApiRouterTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamApiRouterTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamApiRouterTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamClusterControlApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamClusterControlApiTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStreamClusterControlApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamClusterControlApiTests.cs
index a3245d5..125f151 100644
--- a/tests/NATS.Server.Tests/JetStreamClusterControlApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamClusterControlApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamClusterControlApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamClusterControlExtendedApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamClusterControlExtendedApiTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamClusterControlExtendedApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamClusterControlExtendedApiTests.cs
index b0d1a0f..963bba9 100644
--- a/tests/NATS.Server.Tests/JetStreamClusterControlExtendedApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamClusterControlExtendedApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamClusterControlExtendedApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamClusterGovernanceParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamClusterGovernanceParityTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamClusterGovernanceParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamClusterGovernanceParityTests.cs
index 91852a7..722025b 100644
--- a/tests/NATS.Server.Tests/JetStreamClusterGovernanceParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamClusterGovernanceParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Cluster;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamClusterGovernanceParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamClusterReloadTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamClusterReloadTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamClusterReloadTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamClusterReloadTests.cs
index 336e7aa..56b69c4 100644
--- a/tests/NATS.Server.Tests/JetStreamClusterReloadTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamClusterReloadTests.cs
@@ -1,7 +1,7 @@
using Microsoft.Extensions.Logging.Abstractions;
using NATS.Server.Configuration;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamClusterReloadTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConfigValidationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConfigValidationTests.cs
similarity index 90%
rename from tests/NATS.Server.Tests/JetStreamConfigValidationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConfigValidationTests.cs
index 2547006..521c1b4 100644
--- a/tests/NATS.Server.Tests/JetStreamConfigValidationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConfigValidationTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConfigValidationTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamConsumerApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerApiTests.cs
index 53bd823..64a4f9f 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerBackoffParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerBackoffParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStreamConsumerBackoffParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerBackoffParityTests.cs
index c577aca..9e69fa8 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerBackoffParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerBackoffParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerBackoffParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerControlApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerControlApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamConsumerControlApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerControlApiTests.cs
index 0cb767d..1c32000 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerControlApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerControlApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerControlApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerDeliverPolicyParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerDeliverPolicyParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStreamConsumerDeliverPolicyParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerDeliverPolicyParityTests.cs
index 289c8a0..6805052 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerDeliverPolicyParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerDeliverPolicyParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerDeliverPolicyParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerFlowControlParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerFlowControlParityTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamConsumerFlowControlParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerFlowControlParityTests.cs
index ca42ad5..a209265 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerFlowControlParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerFlowControlParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerFlowControlParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerListApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerListApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamConsumerListApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerListApiTests.cs
index f2db8f8..876d07a 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerListApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerListApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerListApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerNextApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerNextApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamConsumerNextApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerNextApiTests.cs
index 85b6670..1bb1430 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerNextApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerNextApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerNextApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamConsumerSemanticsTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerSemanticsTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStreamConsumerSemanticsTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamConsumerSemanticsTests.cs
index 9c96dbe..21ab7d4 100644
--- a/tests/NATS.Server.Tests/JetStreamConsumerSemanticsTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamConsumerSemanticsTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamConsumerSemanticsTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamCrossClusterGatewayParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamCrossClusterGatewayParityTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStreamCrossClusterGatewayParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamCrossClusterGatewayParityTests.cs
index 49f3efb..f9e205a 100644
--- a/tests/NATS.Server.Tests/JetStreamCrossClusterGatewayParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamCrossClusterGatewayParityTests.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using NATS.Server.Configuration;
using NATS.Server.Gateways;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamCrossClusterGatewayParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamDirectGetApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamDirectGetApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamDirectGetApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamDirectGetApiTests.cs
index 01b53a1..4f6420b 100644
--- a/tests/NATS.Server.Tests/JetStreamDirectGetApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamDirectGetApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamDirectGetApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamExpectedHeaderTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamExpectedHeaderTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamExpectedHeaderTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamExpectedHeaderTests.cs
index 09c492b..dcbbf1c 100644
--- a/tests/NATS.Server.Tests/JetStreamExpectedHeaderTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamExpectedHeaderTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamExpectedHeaderTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamFileStoreBlockParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamFileStoreBlockParityTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStreamFileStoreBlockParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamFileStoreBlockParityTests.cs
index 39e014b..9f4d7c0 100644
--- a/tests/NATS.Server.Tests/JetStreamFileStoreBlockParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamFileStoreBlockParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Storage;
using System.Text;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFileStoreBlockParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamFlowReplayBackoffTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamFlowReplayBackoffTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamFlowReplayBackoffTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamFlowReplayBackoffTests.cs
index 496a929..54573b6 100644
--- a/tests/NATS.Server.Tests/JetStreamFlowReplayBackoffTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamFlowReplayBackoffTests.cs
@@ -1,7 +1,7 @@
using System.Diagnostics;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamFlowReplayBackoffTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamIntegrationMatrix.cs b/tests/NATS.Server.JetStream.Tests/JetStreamIntegrationMatrix.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStreamIntegrationMatrix.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamIntegrationMatrix.cs
index 2347760..6bb0f51 100644
--- a/tests/NATS.Server.Tests/JetStreamIntegrationMatrix.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamIntegrationMatrix.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
internal static class JetStreamIntegrationMatrix
{
diff --git a/tests/NATS.Server.Tests/JetStreamIntegrationMatrixTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamIntegrationMatrixTests.cs
similarity index 91%
rename from tests/NATS.Server.Tests/JetStreamIntegrationMatrixTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamIntegrationMatrixTests.cs
index 18cb385..098993e 100644
--- a/tests/NATS.Server.Tests/JetStreamIntegrationMatrixTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamIntegrationMatrixTests.cs
@@ -1,4 +1,4 @@
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamIntegrationMatrixTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamInternalClientRuntimeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamInternalClientRuntimeTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamInternalClientRuntimeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamInternalClientRuntimeTests.cs
index 55c4579..bcff3d3 100644
--- a/tests/NATS.Server.Tests/JetStreamInternalClientRuntimeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamInternalClientRuntimeTests.cs
@@ -3,7 +3,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using NATS.Server.Configuration;
using NATS.Server.JetStream;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamInternalClientRuntimeTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamInternalClientTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamInternalClientTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamInternalClientTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamInternalClientTests.cs
index f619795..b6edd4a 100644
--- a/tests/NATS.Server.Tests/JetStreamInternalClientTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamInternalClientTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.Configuration;
using NATS.Server.JetStream;
using System.Reflection;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamInternalClientTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamJwtLimitTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamJwtLimitTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamJwtLimitTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamJwtLimitTests.cs
index e987e0a..98fe4ab 100644
--- a/tests/NATS.Server.Tests/JetStreamJwtLimitTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamJwtLimitTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamJwtLimitTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamMetaGroupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamMetaGroupTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStreamMetaGroupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamMetaGroupTests.cs
index eea27fb..b5a5a4e 100644
--- a/tests/NATS.Server.Tests/JetStreamMetaGroupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamMetaGroupTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Api;
using NATS.Server.JetStream.Cluster;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamMetaGroupTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamMirrorSourceAdvancedTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceAdvancedTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamMirrorSourceAdvancedTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceAdvancedTests.cs
index 6f48423..9b80d54 100644
--- a/tests/NATS.Server.Tests/JetStreamMirrorSourceAdvancedTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceAdvancedTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamMirrorSourceAdvancedTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamMirrorSourceParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceParityTests.cs
similarity index 96%
rename from tests/NATS.Server.Tests/JetStreamMirrorSourceParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceParityTests.cs
index 8b28fac..59bb31a 100644
--- a/tests/NATS.Server.Tests/JetStreamMirrorSourceParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamMirrorSourceParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamMirrorSourceTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamMirrorSourceTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceTests.cs
index eb1893c..812c12d 100644
--- a/tests/NATS.Server.Tests/JetStreamMirrorSourceTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamMirrorSourceTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamMirrorSourceTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamMonitoringParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamMonitoringParityTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamMonitoringParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamMonitoringParityTests.cs
index 81e6bf1..4da240d 100644
--- a/tests/NATS.Server.Tests/JetStreamMonitoringParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamMonitoringParityTests.cs
@@ -2,7 +2,7 @@ using Microsoft.Extensions.Logging.Abstractions;
using NATS.Server.Configuration;
using NATS.Server.Monitoring;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamMonitoringParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPolicyValidationTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPolicyValidationTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamPolicyValidationTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPolicyValidationTests.cs
index e1a276d..1571156 100644
--- a/tests/NATS.Server.Tests/JetStreamPolicyValidationTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPolicyValidationTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Validation;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPolicyValidationTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPublishPreconditionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPublishPreconditionTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamPublishPreconditionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPublishPreconditionTests.cs
index 8eb0370..6bc6757 100644
--- a/tests/NATS.Server.Tests/JetStreamPublishPreconditionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPublishPreconditionTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPublishPreconditionTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPublishTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPublishTests.cs
similarity index 91%
rename from tests/NATS.Server.Tests/JetStreamPublishTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPublishTests.cs
index 99e7b3b..91fee1a 100644
--- a/tests/NATS.Server.Tests/JetStreamPublishTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPublishTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPublishTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPullConsumerContractTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPullConsumerContractTests.cs
similarity index 91%
rename from tests/NATS.Server.Tests/JetStreamPullConsumerContractTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPullConsumerContractTests.cs
index 3218920..b0751a0 100644
--- a/tests/NATS.Server.Tests/JetStreamPullConsumerContractTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPullConsumerContractTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPullConsumerContractTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPullConsumerTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPullConsumerTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamPullConsumerTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPullConsumerTests.cs
index beb0fde..378f230 100644
--- a/tests/NATS.Server.Tests/JetStreamPullConsumerTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPullConsumerTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPullConsumerTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPushConsumerContractTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPushConsumerContractTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamPushConsumerContractTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPushConsumerContractTests.cs
index 931d98b..58fcba5 100644
--- a/tests/NATS.Server.Tests/JetStreamPushConsumerContractTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPushConsumerContractTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPushConsumerContractTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamPushConsumerTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamPushConsumerTests.cs
similarity index 92%
rename from tests/NATS.Server.Tests/JetStreamPushConsumerTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamPushConsumerTests.cs
index 4a78807..44c09eb 100644
--- a/tests/NATS.Server.Tests/JetStreamPushConsumerTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamPushConsumerTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamPushConsumerTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamRetentionPolicyTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamRetentionPolicyTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamRetentionPolicyTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamRetentionPolicyTests.cs
index 56dd9c1..6ac2e62 100644
--- a/tests/NATS.Server.Tests/JetStreamRetentionPolicyTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamRetentionPolicyTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamRetentionPolicyTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamSnapshotRestoreApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamSnapshotRestoreApiTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStreamSnapshotRestoreApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamSnapshotRestoreApiTests.cs
index 6dff367..e82d87d 100644
--- a/tests/NATS.Server.Tests/JetStreamSnapshotRestoreApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamSnapshotRestoreApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamSnapshotRestoreApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStartupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStartupTests.cs
similarity index 89%
rename from tests/NATS.Server.Tests/JetStreamStartupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStartupTests.cs
index b7ddadb..64a8b6f 100644
--- a/tests/NATS.Server.Tests/JetStreamStartupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStartupTests.cs
@@ -1,5 +1,5 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStartupTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStorageSelectionTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStorageSelectionTests.cs
similarity index 90%
rename from tests/NATS.Server.Tests/JetStreamStorageSelectionTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStorageSelectionTests.cs
index 2032279..2963081 100644
--- a/tests/NATS.Server.Tests/JetStreamStorageSelectionTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStorageSelectionTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStorageSelectionTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStoreExpiryParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStoreExpiryParityTests.cs
similarity index 94%
rename from tests/NATS.Server.Tests/JetStreamStoreExpiryParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStoreExpiryParityTests.cs
index aa237d3..4bb1eb1 100644
--- a/tests/NATS.Server.Tests/JetStreamStoreExpiryParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStoreExpiryParityTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStoreExpiryParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStoreIndexTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStoreIndexTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamStoreIndexTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStoreIndexTests.cs
index 9c1924a..5c91d98 100644
--- a/tests/NATS.Server.Tests/JetStreamStoreIndexTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStoreIndexTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStoreIndexTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamStreamApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamApiTests.cs
index 6c3ace5..cf4b669 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamConfigBehaviorTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamConfigBehaviorTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamStreamConfigBehaviorTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamConfigBehaviorTests.cs
index 89531dc..e52749a 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamConfigBehaviorTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamConfigBehaviorTests.cs
@@ -2,7 +2,7 @@ using NATS.Server.JetStream.Models;
using NATS.Server.JetStream;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamConfigBehaviorTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamLifecycleApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamLifecycleApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamStreamLifecycleApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamLifecycleApiTests.cs
index 74fc030..e007f54 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamLifecycleApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamLifecycleApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamLifecycleApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamListApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamListApiTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/JetStreamStreamListApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamListApiTests.cs
index 907ee86..19d1aa5 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamListApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamListApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamListApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamMessageApiTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamMessageApiTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStreamStreamMessageApiTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamMessageApiTests.cs
index 683d826..16e46dd 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamMessageApiTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamMessageApiTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamMessageApiTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamPolicyParityTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamPolicyParityTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/JetStreamStreamPolicyParityTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamPolicyParityTests.cs
index e597ab1..2166e78 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamPolicyParityTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamPolicyParityTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamPolicyParityTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamPolicyRuntimeTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamPolicyRuntimeTests.cs
similarity index 95%
rename from tests/NATS.Server.Tests/JetStreamStreamPolicyRuntimeTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamPolicyRuntimeTests.cs
index 015ab6d..f428dac 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamPolicyRuntimeTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamPolicyRuntimeTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.TestUtilities;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamPolicyRuntimeTests
{
diff --git a/tests/NATS.Server.Tests/JetStreamStreamReplicaGroupTests.cs b/tests/NATS.Server.JetStream.Tests/JetStreamStreamReplicaGroupTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/JetStreamStreamReplicaGroupTests.cs
rename to tests/NATS.Server.JetStream.Tests/JetStreamStreamReplicaGroupTests.cs
index 17e1cf2..e9da642 100644
--- a/tests/NATS.Server.Tests/JetStreamStreamReplicaGroupTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/JetStreamStreamReplicaGroupTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Publish;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class JetStreamStreamReplicaGroupTests
{
diff --git a/tests/NATS.Server.Tests/MemStoreTests.cs b/tests/NATS.Server.JetStream.Tests/MemStoreTests.cs
similarity index 93%
rename from tests/NATS.Server.Tests/MemStoreTests.cs
rename to tests/NATS.Server.JetStream.Tests/MemStoreTests.cs
index 78cabc4..e670b98 100644
--- a/tests/NATS.Server.Tests/MemStoreTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/MemStoreTests.cs
@@ -1,6 +1,6 @@
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class MemStoreTests
{
diff --git a/tests/NATS.Server.Tests/MirrorSourceRetryTests.cs b/tests/NATS.Server.JetStream.Tests/MirrorSourceRetryTests.cs
similarity index 98%
rename from tests/NATS.Server.Tests/MirrorSourceRetryTests.cs
rename to tests/NATS.Server.JetStream.Tests/MirrorSourceRetryTests.cs
index 54efd06..9bf912b 100644
--- a/tests/NATS.Server.Tests/MirrorSourceRetryTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/MirrorSourceRetryTests.cs
@@ -3,7 +3,7 @@ using NATS.Server.JetStream.MirrorSource;
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
// Go reference: server/stream.go:3478-3505 (calculateRetryBackoff),
// server/stream.go:3125-3400 (setupMirrorConsumer retry logic)
diff --git a/tests/NATS.Server.JetStream.Tests/NATS.Server.JetStream.Tests.csproj b/tests/NATS.Server.JetStream.Tests/NATS.Server.JetStream.Tests.csproj
new file mode 100644
index 0000000..ae8fb09
--- /dev/null
+++ b/tests/NATS.Server.JetStream.Tests/NATS.Server.JetStream.Tests.csproj
@@ -0,0 +1,26 @@
+
+
+ false
+ $(DefineConstants);JETSTREAM_INTEGRATION_MATRIX
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tests/NATS.Server.Tests/StreamStoreContractTests.cs b/tests/NATS.Server.JetStream.Tests/StreamStoreContractTests.cs
similarity index 97%
rename from tests/NATS.Server.Tests/StreamStoreContractTests.cs
rename to tests/NATS.Server.JetStream.Tests/StreamStoreContractTests.cs
index cc8ba73..5f3e771 100644
--- a/tests/NATS.Server.Tests/StreamStoreContractTests.cs
+++ b/tests/NATS.Server.JetStream.Tests/StreamStoreContractTests.cs
@@ -1,7 +1,7 @@
using NATS.Server.JetStream.Models;
using NATS.Server.JetStream.Storage;
-namespace NATS.Server.Tests;
+namespace NATS.Server.JetStream.Tests;
public class StreamStoreContractTests
{