diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3752124..d8f1a3f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v3.3.0
       - uses: dart-lang/setup-dart@v1.4
         with:
-          sdk: 2.18.5
+          sdk: 3.0.7
       - name: Install dependencies
         run: dart pub global activate melos 2.3.1 && melos bs
           
@@ -59,7 +59,7 @@ jobs:
         - uses: actions/checkout@v3.3.0
         - uses: dart-lang/setup-dart@v1.4
           with:
-            sdk: 2.18.5
+            sdk: 3.0.7
         - name: Install dependencies
           run: |
             dart pub global activate melos 2.3.1 && melos bs
diff --git a/packages/test_track/lib/src/models/app_version_build.freezed.dart b/packages/test_track/lib/src/models/app_version_build.freezed.dart
index 52f8e1e..2ea2e89 100644
--- a/packages/test_track/lib/src/models/app_version_build.freezed.dart
+++ b/packages/test_track/lib/src/models/app_version_build.freezed.dart
@@ -74,22 +74,22 @@ class _$AppVersionBuildCopyWithImpl<$Res, $Val extends AppVersionBuild>
 }
 
 /// @nodoc
-abstract class _$$_AppVersionBuildCopyWith<$Res>
+abstract class _$$AppVersionBuildImplCopyWith<$Res>
     implements $AppVersionBuildCopyWith<$Res> {
-  factory _$$_AppVersionBuildCopyWith(
-          _$_AppVersionBuild value, $Res Function(_$_AppVersionBuild) then) =
-      __$$_AppVersionBuildCopyWithImpl<$Res>;
+  factory _$$AppVersionBuildImplCopyWith(_$AppVersionBuildImpl value,
+          $Res Function(_$AppVersionBuildImpl) then) =
+      __$$AppVersionBuildImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String appName, String version, String buildTimestamp});
 }
 
 /// @nodoc
-class __$$_AppVersionBuildCopyWithImpl<$Res>
-    extends _$AppVersionBuildCopyWithImpl<$Res, _$_AppVersionBuild>
-    implements _$$_AppVersionBuildCopyWith<$Res> {
-  __$$_AppVersionBuildCopyWithImpl(
-      _$_AppVersionBuild _value, $Res Function(_$_AppVersionBuild) _then)
+class __$$AppVersionBuildImplCopyWithImpl<$Res>
+    extends _$AppVersionBuildCopyWithImpl<$Res, _$AppVersionBuildImpl>
+    implements _$$AppVersionBuildImplCopyWith<$Res> {
+  __$$AppVersionBuildImplCopyWithImpl(
+      _$AppVersionBuildImpl _value, $Res Function(_$AppVersionBuildImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -99,7 +99,7 @@ class __$$_AppVersionBuildCopyWithImpl<$Res>
     Object? version = null,
     Object? buildTimestamp = null,
   }) {
-    return _then(_$_AppVersionBuild(
+    return _then(_$AppVersionBuildImpl(
       appName: null == appName
           ? _value.appName
           : appName // ignore: cast_nullable_to_non_nullable
@@ -119,14 +119,14 @@ class __$$_AppVersionBuildCopyWithImpl<$Res>
 /// @nodoc
 
 @JsonSerializable(fieldRename: FieldRename.none)
-class _$_AppVersionBuild implements _AppVersionBuild {
-  const _$_AppVersionBuild(
+class _$AppVersionBuildImpl implements _AppVersionBuild {
+  const _$AppVersionBuildImpl(
       {required this.appName,
       required this.version,
       required this.buildTimestamp});
 
-  factory _$_AppVersionBuild.fromJson(Map<String, dynamic> json) =>
-      _$$_AppVersionBuildFromJson(json);
+  factory _$AppVersionBuildImpl.fromJson(Map<String, dynamic> json) =>
+      _$$AppVersionBuildImplFromJson(json);
 
   @override
   final String appName;
@@ -144,7 +144,7 @@ class _$_AppVersionBuild implements _AppVersionBuild {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_AppVersionBuild &&
+            other is _$AppVersionBuildImpl &&
             (identical(other.appName, appName) || other.appName == appName) &&
             (identical(other.version, version) || other.version == version) &&
             (identical(other.buildTimestamp, buildTimestamp) ||
@@ -159,12 +159,13 @@ class _$_AppVersionBuild implements _AppVersionBuild {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_AppVersionBuildCopyWith<_$_AppVersionBuild> get copyWith =>
-      __$$_AppVersionBuildCopyWithImpl<_$_AppVersionBuild>(this, _$identity);
+  _$$AppVersionBuildImplCopyWith<_$AppVersionBuildImpl> get copyWith =>
+      __$$AppVersionBuildImplCopyWithImpl<_$AppVersionBuildImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_AppVersionBuildToJson(
+    return _$$AppVersionBuildImplToJson(
       this,
     );
   }
@@ -174,10 +175,10 @@ abstract class _AppVersionBuild implements AppVersionBuild {
   const factory _AppVersionBuild(
       {required final String appName,
       required final String version,
-      required final String buildTimestamp}) = _$_AppVersionBuild;
+      required final String buildTimestamp}) = _$AppVersionBuildImpl;
 
   factory _AppVersionBuild.fromJson(Map<String, dynamic> json) =
-      _$_AppVersionBuild.fromJson;
+      _$AppVersionBuildImpl.fromJson;
 
   @override
   String get appName;
@@ -187,6 +188,6 @@ abstract class _AppVersionBuild implements AppVersionBuild {
   String get buildTimestamp;
   @override
   @JsonKey(ignore: true)
-  _$$_AppVersionBuildCopyWith<_$_AppVersionBuild> get copyWith =>
+  _$$AppVersionBuildImplCopyWith<_$AppVersionBuildImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/app_version_build.g.dart b/packages/test_track/lib/src/models/app_version_build.g.dart
index 2e32cf9..d5be96b 100644
--- a/packages/test_track/lib/src/models/app_version_build.g.dart
+++ b/packages/test_track/lib/src/models/app_version_build.g.dart
@@ -8,12 +8,13 @@ part of 'app_version_build.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_AppVersionBuild _$$_AppVersionBuildFromJson(Map<String, dynamic> json) =>
+_$AppVersionBuildImpl _$$AppVersionBuildImplFromJson(
+        Map<String, dynamic> json) =>
     $checkedCreate(
-      r'_$_AppVersionBuild',
+      r'_$AppVersionBuildImpl',
       json,
       ($checkedConvert) {
-        final val = _$_AppVersionBuild(
+        final val = _$AppVersionBuildImpl(
           appName: $checkedConvert('appName', (v) => v as String),
           version: $checkedConvert('version', (v) => v as String),
           buildTimestamp: $checkedConvert('buildTimestamp', (v) => v as String),
@@ -22,7 +23,8 @@ _$_AppVersionBuild _$$_AppVersionBuildFromJson(Map<String, dynamic> json) =>
       },
     );
 
-Map<String, dynamic> _$$_AppVersionBuildToJson(_$_AppVersionBuild instance) =>
+Map<String, dynamic> _$$AppVersionBuildImplToJson(
+        _$AppVersionBuildImpl instance) =>
     <String, dynamic>{
       'appName': instance.appName,
       'version': instance.version,
diff --git a/packages/test_track/lib/src/models/app_visitor_config.freezed.dart b/packages/test_track/lib/src/models/app_visitor_config.freezed.dart
index 63bbfdd..76064be 100644
--- a/packages/test_track/lib/src/models/app_visitor_config.freezed.dart
+++ b/packages/test_track/lib/src/models/app_visitor_config.freezed.dart
@@ -78,11 +78,11 @@ class _$AppVisitorConfigCopyWithImpl<$Res, $Val extends AppVisitorConfig>
 }
 
 /// @nodoc
-abstract class _$$_AppVisitorConfigCopyWith<$Res>
+abstract class _$$AppVisitorConfigImplCopyWith<$Res>
     implements $AppVisitorConfigCopyWith<$Res> {
-  factory _$$_AppVisitorConfigCopyWith(
-          _$_AppVisitorConfig value, $Res Function(_$_AppVisitorConfig) then) =
-      __$$_AppVisitorConfigCopyWithImpl<$Res>;
+  factory _$$AppVisitorConfigImplCopyWith(_$AppVisitorConfigImpl value,
+          $Res Function(_$AppVisitorConfigImpl) then) =
+      __$$AppVisitorConfigImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({List<Split> splits, Visitor visitor});
@@ -92,11 +92,11 @@ abstract class _$$_AppVisitorConfigCopyWith<$Res>
 }
 
 /// @nodoc
-class __$$_AppVisitorConfigCopyWithImpl<$Res>
-    extends _$AppVisitorConfigCopyWithImpl<$Res, _$_AppVisitorConfig>
-    implements _$$_AppVisitorConfigCopyWith<$Res> {
-  __$$_AppVisitorConfigCopyWithImpl(
-      _$_AppVisitorConfig _value, $Res Function(_$_AppVisitorConfig) _then)
+class __$$AppVisitorConfigImplCopyWithImpl<$Res>
+    extends _$AppVisitorConfigCopyWithImpl<$Res, _$AppVisitorConfigImpl>
+    implements _$$AppVisitorConfigImplCopyWith<$Res> {
+  __$$AppVisitorConfigImplCopyWithImpl(_$AppVisitorConfigImpl _value,
+      $Res Function(_$AppVisitorConfigImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -105,7 +105,7 @@ class __$$_AppVisitorConfigCopyWithImpl<$Res>
     Object? splits = null,
     Object? visitor = null,
   }) {
-    return _then(_$_AppVisitorConfig(
+    return _then(_$AppVisitorConfigImpl(
       splits: null == splits
           ? _value._splits
           : splits // ignore: cast_nullable_to_non_nullable
@@ -120,13 +120,13 @@ class __$$_AppVisitorConfigCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_AppVisitorConfig implements _AppVisitorConfig {
-  const _$_AppVisitorConfig(
+class _$AppVisitorConfigImpl implements _AppVisitorConfig {
+  const _$AppVisitorConfigImpl(
       {required final List<Split> splits, required this.visitor})
       : _splits = splits;
 
-  factory _$_AppVisitorConfig.fromJson(Map<String, dynamic> json) =>
-      _$$_AppVisitorConfigFromJson(json);
+  factory _$AppVisitorConfigImpl.fromJson(Map<String, dynamic> json) =>
+      _$$AppVisitorConfigImplFromJson(json);
 
   final List<Split> _splits;
   @override
@@ -148,7 +148,7 @@ class _$_AppVisitorConfig implements _AppVisitorConfig {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_AppVisitorConfig &&
+            other is _$AppVisitorConfigImpl &&
             const DeepCollectionEquality().equals(other._splits, _splits) &&
             (identical(other.visitor, visitor) || other.visitor == visitor));
   }
@@ -161,12 +161,13 @@ class _$_AppVisitorConfig implements _AppVisitorConfig {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_AppVisitorConfigCopyWith<_$_AppVisitorConfig> get copyWith =>
-      __$$_AppVisitorConfigCopyWithImpl<_$_AppVisitorConfig>(this, _$identity);
+  _$$AppVisitorConfigImplCopyWith<_$AppVisitorConfigImpl> get copyWith =>
+      __$$AppVisitorConfigImplCopyWithImpl<_$AppVisitorConfigImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_AppVisitorConfigToJson(
+    return _$$AppVisitorConfigImplToJson(
       this,
     );
   }
@@ -175,10 +176,10 @@ class _$_AppVisitorConfig implements _AppVisitorConfig {
 abstract class _AppVisitorConfig implements AppVisitorConfig {
   const factory _AppVisitorConfig(
       {required final List<Split> splits,
-      required final Visitor visitor}) = _$_AppVisitorConfig;
+      required final Visitor visitor}) = _$AppVisitorConfigImpl;
 
   factory _AppVisitorConfig.fromJson(Map<String, dynamic> json) =
-      _$_AppVisitorConfig.fromJson;
+      _$AppVisitorConfigImpl.fromJson;
 
   @override
   List<Split> get splits;
@@ -186,6 +187,6 @@ abstract class _AppVisitorConfig implements AppVisitorConfig {
   Visitor get visitor;
   @override
   @JsonKey(ignore: true)
-  _$$_AppVisitorConfigCopyWith<_$_AppVisitorConfig> get copyWith =>
+  _$$AppVisitorConfigImplCopyWith<_$AppVisitorConfigImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/app_visitor_config.g.dart b/packages/test_track/lib/src/models/app_visitor_config.g.dart
index 3066a38..51a03be 100644
--- a/packages/test_track/lib/src/models/app_visitor_config.g.dart
+++ b/packages/test_track/lib/src/models/app_visitor_config.g.dart
@@ -8,12 +8,13 @@ part of 'app_visitor_config.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_AppVisitorConfig _$$_AppVisitorConfigFromJson(Map<String, dynamic> json) =>
+_$AppVisitorConfigImpl _$$AppVisitorConfigImplFromJson(
+        Map<String, dynamic> json) =>
     $checkedCreate(
-      r'_$_AppVisitorConfig',
+      r'_$AppVisitorConfigImpl',
       json,
       ($checkedConvert) {
-        final val = _$_AppVisitorConfig(
+        final val = _$AppVisitorConfigImpl(
           splits: $checkedConvert(
               'splits',
               (v) => (v as List<dynamic>)
@@ -26,7 +27,8 @@ _$_AppVisitorConfig _$$_AppVisitorConfigFromJson(Map<String, dynamic> json) =>
       },
     );
 
-Map<String, dynamic> _$$_AppVisitorConfigToJson(_$_AppVisitorConfig instance) =>
+Map<String, dynamic> _$$AppVisitorConfigImplToJson(
+        _$AppVisitorConfigImpl instance) =>
     <String, dynamic>{
       'splits': instance.splits.map((e) => e.toJson()).toList(),
       'visitor': instance.visitor.toJson(),
diff --git a/packages/test_track/lib/src/models/assignment.freezed.dart b/packages/test_track/lib/src/models/assignment.freezed.dart
index e7a9bd4..eb9b4fa 100644
--- a/packages/test_track/lib/src/models/assignment.freezed.dart
+++ b/packages/test_track/lib/src/models/assignment.freezed.dart
@@ -74,22 +74,22 @@ class _$AssignmentCopyWithImpl<$Res, $Val extends Assignment>
 }
 
 /// @nodoc
-abstract class _$$_AssignmentCopyWith<$Res>
+abstract class _$$AssignmentImplCopyWith<$Res>
     implements $AssignmentCopyWith<$Res> {
-  factory _$$_AssignmentCopyWith(
-          _$_Assignment value, $Res Function(_$_Assignment) then) =
-      __$$_AssignmentCopyWithImpl<$Res>;
+  factory _$$AssignmentImplCopyWith(
+          _$AssignmentImpl value, $Res Function(_$AssignmentImpl) then) =
+      __$$AssignmentImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String splitName, String variant, String context});
 }
 
 /// @nodoc
-class __$$_AssignmentCopyWithImpl<$Res>
-    extends _$AssignmentCopyWithImpl<$Res, _$_Assignment>
-    implements _$$_AssignmentCopyWith<$Res> {
-  __$$_AssignmentCopyWithImpl(
-      _$_Assignment _value, $Res Function(_$_Assignment) _then)
+class __$$AssignmentImplCopyWithImpl<$Res>
+    extends _$AssignmentCopyWithImpl<$Res, _$AssignmentImpl>
+    implements _$$AssignmentImplCopyWith<$Res> {
+  __$$AssignmentImplCopyWithImpl(
+      _$AssignmentImpl _value, $Res Function(_$AssignmentImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -99,7 +99,7 @@ class __$$_AssignmentCopyWithImpl<$Res>
     Object? variant = null,
     Object? context = null,
   }) {
-    return _then(_$_Assignment(
+    return _then(_$AssignmentImpl(
       splitName: null == splitName
           ? _value.splitName
           : splitName // ignore: cast_nullable_to_non_nullable
@@ -118,12 +118,12 @@ class __$$_AssignmentCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_Assignment implements _Assignment {
-  const _$_Assignment(
+class _$AssignmentImpl implements _Assignment {
+  const _$AssignmentImpl(
       {required this.splitName, required this.variant, this.context = ''});
 
-  factory _$_Assignment.fromJson(Map<String, dynamic> json) =>
-      _$$_AssignmentFromJson(json);
+  factory _$AssignmentImpl.fromJson(Map<String, dynamic> json) =>
+      _$$AssignmentImplFromJson(json);
 
   @override
   final String splitName;
@@ -142,7 +142,7 @@ class _$_Assignment implements _Assignment {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Assignment &&
+            other is _$AssignmentImpl &&
             (identical(other.splitName, splitName) ||
                 other.splitName == splitName) &&
             (identical(other.variant, variant) || other.variant == variant) &&
@@ -156,12 +156,12 @@ class _$_Assignment implements _Assignment {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_AssignmentCopyWith<_$_Assignment> get copyWith =>
-      __$$_AssignmentCopyWithImpl<_$_Assignment>(this, _$identity);
+  _$$AssignmentImplCopyWith<_$AssignmentImpl> get copyWith =>
+      __$$AssignmentImplCopyWithImpl<_$AssignmentImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_AssignmentToJson(
+    return _$$AssignmentImplToJson(
       this,
     );
   }
@@ -171,10 +171,10 @@ abstract class _Assignment implements Assignment {
   const factory _Assignment(
       {required final String splitName,
       required final String variant,
-      final String context}) = _$_Assignment;
+      final String context}) = _$AssignmentImpl;
 
   factory _Assignment.fromJson(Map<String, dynamic> json) =
-      _$_Assignment.fromJson;
+      _$AssignmentImpl.fromJson;
 
   @override
   String get splitName;
@@ -184,6 +184,6 @@ abstract class _Assignment implements Assignment {
   String get context;
   @override
   @JsonKey(ignore: true)
-  _$$_AssignmentCopyWith<_$_Assignment> get copyWith =>
+  _$$AssignmentImplCopyWith<_$AssignmentImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/assignment.g.dart b/packages/test_track/lib/src/models/assignment.g.dart
index 6007b5e..19b543b 100644
--- a/packages/test_track/lib/src/models/assignment.g.dart
+++ b/packages/test_track/lib/src/models/assignment.g.dart
@@ -8,12 +8,12 @@ part of 'assignment.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_Assignment _$$_AssignmentFromJson(Map<String, dynamic> json) =>
+_$AssignmentImpl _$$AssignmentImplFromJson(Map<String, dynamic> json) =>
     $checkedCreate(
-      r'_$_Assignment',
+      r'_$AssignmentImpl',
       json,
       ($checkedConvert) {
-        final val = _$_Assignment(
+        final val = _$AssignmentImpl(
           splitName: $checkedConvert('split_name', (v) => v as String),
           variant: $checkedConvert('variant', (v) => v as String),
           context: $checkedConvert('context', (v) => v as String? ?? ''),
@@ -23,7 +23,7 @@ _$_Assignment _$$_AssignmentFromJson(Map<String, dynamic> json) =>
       fieldKeyMap: const {'splitName': 'split_name'},
     );
 
-Map<String, dynamic> _$$_AssignmentToJson(_$_Assignment instance) =>
+Map<String, dynamic> _$$AssignmentImplToJson(_$AssignmentImpl instance) =>
     <String, dynamic>{
       'split_name': instance.splitName,
       'variant': instance.variant,
diff --git a/packages/test_track/lib/src/models/assignment_event.freezed.dart b/packages/test_track/lib/src/models/assignment_event.freezed.dart
index b226c47..af0224e 100644
--- a/packages/test_track/lib/src/models/assignment_event.freezed.dart
+++ b/packages/test_track/lib/src/models/assignment_event.freezed.dart
@@ -74,22 +74,22 @@ class _$AssignmentEventCopyWithImpl<$Res, $Val extends AssignmentEvent>
 }
 
 /// @nodoc
-abstract class _$$_AssignmentEventCopyWith<$Res>
+abstract class _$$AssignmentEventImplCopyWith<$Res>
     implements $AssignmentEventCopyWith<$Res> {
-  factory _$$_AssignmentEventCopyWith(
-          _$_AssignmentEvent value, $Res Function(_$_AssignmentEvent) then) =
-      __$$_AssignmentEventCopyWithImpl<$Res>;
+  factory _$$AssignmentEventImplCopyWith(_$AssignmentEventImpl value,
+          $Res Function(_$AssignmentEventImpl) then) =
+      __$$AssignmentEventImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String visitorId, String splitName, String context});
 }
 
 /// @nodoc
-class __$$_AssignmentEventCopyWithImpl<$Res>
-    extends _$AssignmentEventCopyWithImpl<$Res, _$_AssignmentEvent>
-    implements _$$_AssignmentEventCopyWith<$Res> {
-  __$$_AssignmentEventCopyWithImpl(
-      _$_AssignmentEvent _value, $Res Function(_$_AssignmentEvent) _then)
+class __$$AssignmentEventImplCopyWithImpl<$Res>
+    extends _$AssignmentEventCopyWithImpl<$Res, _$AssignmentEventImpl>
+    implements _$$AssignmentEventImplCopyWith<$Res> {
+  __$$AssignmentEventImplCopyWithImpl(
+      _$AssignmentEventImpl _value, $Res Function(_$AssignmentEventImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -99,7 +99,7 @@ class __$$_AssignmentEventCopyWithImpl<$Res>
     Object? splitName = null,
     Object? context = null,
   }) {
-    return _then(_$_AssignmentEvent(
+    return _then(_$AssignmentEventImpl(
       visitorId: null == visitorId
           ? _value.visitorId
           : visitorId // ignore: cast_nullable_to_non_nullable
@@ -118,14 +118,14 @@ class __$$_AssignmentEventCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_AssignmentEvent implements _AssignmentEvent {
-  const _$_AssignmentEvent(
+class _$AssignmentEventImpl implements _AssignmentEvent {
+  const _$AssignmentEventImpl(
       {required this.visitorId,
       required this.splitName,
       required this.context});
 
-  factory _$_AssignmentEvent.fromJson(Map<String, dynamic> json) =>
-      _$$_AssignmentEventFromJson(json);
+  factory _$AssignmentEventImpl.fromJson(Map<String, dynamic> json) =>
+      _$$AssignmentEventImplFromJson(json);
 
   @override
   final String visitorId;
@@ -143,7 +143,7 @@ class _$_AssignmentEvent implements _AssignmentEvent {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_AssignmentEvent &&
+            other is _$AssignmentEventImpl &&
             (identical(other.visitorId, visitorId) ||
                 other.visitorId == visitorId) &&
             (identical(other.splitName, splitName) ||
@@ -158,12 +158,13 @@ class _$_AssignmentEvent implements _AssignmentEvent {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_AssignmentEventCopyWith<_$_AssignmentEvent> get copyWith =>
-      __$$_AssignmentEventCopyWithImpl<_$_AssignmentEvent>(this, _$identity);
+  _$$AssignmentEventImplCopyWith<_$AssignmentEventImpl> get copyWith =>
+      __$$AssignmentEventImplCopyWithImpl<_$AssignmentEventImpl>(
+          this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_AssignmentEventToJson(
+    return _$$AssignmentEventImplToJson(
       this,
     );
   }
@@ -173,10 +174,10 @@ abstract class _AssignmentEvent implements AssignmentEvent {
   const factory _AssignmentEvent(
       {required final String visitorId,
       required final String splitName,
-      required final String context}) = _$_AssignmentEvent;
+      required final String context}) = _$AssignmentEventImpl;
 
   factory _AssignmentEvent.fromJson(Map<String, dynamic> json) =
-      _$_AssignmentEvent.fromJson;
+      _$AssignmentEventImpl.fromJson;
 
   @override
   String get visitorId;
@@ -186,6 +187,6 @@ abstract class _AssignmentEvent implements AssignmentEvent {
   String get context;
   @override
   @JsonKey(ignore: true)
-  _$$_AssignmentEventCopyWith<_$_AssignmentEvent> get copyWith =>
+  _$$AssignmentEventImplCopyWith<_$AssignmentEventImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/assignment_event.g.dart b/packages/test_track/lib/src/models/assignment_event.g.dart
index f6064be..04046fe 100644
--- a/packages/test_track/lib/src/models/assignment_event.g.dart
+++ b/packages/test_track/lib/src/models/assignment_event.g.dart
@@ -8,12 +8,13 @@ part of 'assignment_event.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_AssignmentEvent _$$_AssignmentEventFromJson(Map<String, dynamic> json) =>
+_$AssignmentEventImpl _$$AssignmentEventImplFromJson(
+        Map<String, dynamic> json) =>
     $checkedCreate(
-      r'_$_AssignmentEvent',
+      r'_$AssignmentEventImpl',
       json,
       ($checkedConvert) {
-        final val = _$_AssignmentEvent(
+        final val = _$AssignmentEventImpl(
           visitorId: $checkedConvert('visitor_id', (v) => v as String),
           splitName: $checkedConvert('split_name', (v) => v as String),
           context: $checkedConvert('context', (v) => v as String),
@@ -23,7 +24,8 @@ _$_AssignmentEvent _$$_AssignmentEventFromJson(Map<String, dynamic> json) =>
       fieldKeyMap: const {'visitorId': 'visitor_id', 'splitName': 'split_name'},
     );
 
-Map<String, dynamic> _$$_AssignmentEventToJson(_$_AssignmentEvent instance) =>
+Map<String, dynamic> _$$AssignmentEventImplToJson(
+        _$AssignmentEventImpl instance) =>
     <String, dynamic>{
       'visitor_id': instance.visitorId,
       'split_name': instance.splitName,
diff --git a/packages/test_track/lib/src/models/identifier.freezed.dart b/packages/test_track/lib/src/models/identifier.freezed.dart
index af4056c..a7f00db 100644
--- a/packages/test_track/lib/src/models/identifier.freezed.dart
+++ b/packages/test_track/lib/src/models/identifier.freezed.dart
@@ -68,22 +68,22 @@ class _$IdentifierCopyWithImpl<$Res, $Val extends Identifier>
 }
 
 /// @nodoc
-abstract class _$$_IdentifierCopyWith<$Res>
+abstract class _$$IdentifierImplCopyWith<$Res>
     implements $IdentifierCopyWith<$Res> {
-  factory _$$_IdentifierCopyWith(
-          _$_Identifier value, $Res Function(_$_Identifier) then) =
-      __$$_IdentifierCopyWithImpl<$Res>;
+  factory _$$IdentifierImplCopyWith(
+          _$IdentifierImpl value, $Res Function(_$IdentifierImpl) then) =
+      __$$IdentifierImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String identifierType, String value});
 }
 
 /// @nodoc
-class __$$_IdentifierCopyWithImpl<$Res>
-    extends _$IdentifierCopyWithImpl<$Res, _$_Identifier>
-    implements _$$_IdentifierCopyWith<$Res> {
-  __$$_IdentifierCopyWithImpl(
-      _$_Identifier _value, $Res Function(_$_Identifier) _then)
+class __$$IdentifierImplCopyWithImpl<$Res>
+    extends _$IdentifierCopyWithImpl<$Res, _$IdentifierImpl>
+    implements _$$IdentifierImplCopyWith<$Res> {
+  __$$IdentifierImplCopyWithImpl(
+      _$IdentifierImpl _value, $Res Function(_$IdentifierImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -92,7 +92,7 @@ class __$$_IdentifierCopyWithImpl<$Res>
     Object? identifierType = null,
     Object? value = null,
   }) {
-    return _then(_$_Identifier(
+    return _then(_$IdentifierImpl(
       identifierType: null == identifierType
           ? _value.identifierType
           : identifierType // ignore: cast_nullable_to_non_nullable
@@ -107,11 +107,11 @@ class __$$_IdentifierCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_Identifier implements _Identifier {
-  const _$_Identifier({required this.identifierType, required this.value});
+class _$IdentifierImpl implements _Identifier {
+  const _$IdentifierImpl({required this.identifierType, required this.value});
 
-  factory _$_Identifier.fromJson(Map<String, dynamic> json) =>
-      _$$_IdentifierFromJson(json);
+  factory _$IdentifierImpl.fromJson(Map<String, dynamic> json) =>
+      _$$IdentifierImplFromJson(json);
 
   @override
   final String identifierType;
@@ -127,7 +127,7 @@ class _$_Identifier implements _Identifier {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Identifier &&
+            other is _$IdentifierImpl &&
             (identical(other.identifierType, identifierType) ||
                 other.identifierType == identifierType) &&
             (identical(other.value, value) || other.value == value));
@@ -140,12 +140,12 @@ class _$_Identifier implements _Identifier {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_IdentifierCopyWith<_$_Identifier> get copyWith =>
-      __$$_IdentifierCopyWithImpl<_$_Identifier>(this, _$identity);
+  _$$IdentifierImplCopyWith<_$IdentifierImpl> get copyWith =>
+      __$$IdentifierImplCopyWithImpl<_$IdentifierImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_IdentifierToJson(
+    return _$$IdentifierImplToJson(
       this,
     );
   }
@@ -154,10 +154,10 @@ class _$_Identifier implements _Identifier {
 abstract class _Identifier implements Identifier {
   const factory _Identifier(
       {required final String identifierType,
-      required final String value}) = _$_Identifier;
+      required final String value}) = _$IdentifierImpl;
 
   factory _Identifier.fromJson(Map<String, dynamic> json) =
-      _$_Identifier.fromJson;
+      _$IdentifierImpl.fromJson;
 
   @override
   String get identifierType;
@@ -165,6 +165,6 @@ abstract class _Identifier implements Identifier {
   String get value;
   @override
   @JsonKey(ignore: true)
-  _$$_IdentifierCopyWith<_$_Identifier> get copyWith =>
+  _$$IdentifierImplCopyWith<_$IdentifierImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/identifier.g.dart b/packages/test_track/lib/src/models/identifier.g.dart
index 5099a74..8c79cf9 100644
--- a/packages/test_track/lib/src/models/identifier.g.dart
+++ b/packages/test_track/lib/src/models/identifier.g.dart
@@ -8,12 +8,12 @@ part of 'identifier.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_Identifier _$$_IdentifierFromJson(Map<String, dynamic> json) =>
+_$IdentifierImpl _$$IdentifierImplFromJson(Map<String, dynamic> json) =>
     $checkedCreate(
-      r'_$_Identifier',
+      r'_$IdentifierImpl',
       json,
       ($checkedConvert) {
-        final val = _$_Identifier(
+        final val = _$IdentifierImpl(
           identifierType:
               $checkedConvert('identifier_type', (v) => v as String),
           value: $checkedConvert('value', (v) => v as String),
@@ -23,7 +23,7 @@ _$_Identifier _$$_IdentifierFromJson(Map<String, dynamic> json) =>
       fieldKeyMap: const {'identifierType': 'identifier_type'},
     );
 
-Map<String, dynamic> _$$_IdentifierToJson(_$_Identifier instance) =>
+Map<String, dynamic> _$$IdentifierImplToJson(_$IdentifierImpl instance) =>
     <String, dynamic>{
       'identifier_type': instance.identifierType,
       'value': instance.value,
diff --git a/packages/test_track/lib/src/models/split.freezed.dart b/packages/test_track/lib/src/models/split.freezed.dart
index d167aa4..b794484 100644
--- a/packages/test_track/lib/src/models/split.freezed.dart
+++ b/packages/test_track/lib/src/models/split.freezed.dart
@@ -76,9 +76,10 @@ class _$SplitCopyWithImpl<$Res, $Val extends Split>
 }
 
 /// @nodoc
-abstract class _$$_SplitCopyWith<$Res> implements $SplitCopyWith<$Res> {
-  factory _$$_SplitCopyWith(_$_Split value, $Res Function(_$_Split) then) =
-      __$$_SplitCopyWithImpl<$Res>;
+abstract class _$$SplitImplCopyWith<$Res> implements $SplitCopyWith<$Res> {
+  factory _$$SplitImplCopyWith(
+          _$SplitImpl value, $Res Function(_$SplitImpl) then) =
+      __$$SplitImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call(
@@ -88,9 +89,11 @@ abstract class _$$_SplitCopyWith<$Res> implements $SplitCopyWith<$Res> {
 }
 
 /// @nodoc
-class __$$_SplitCopyWithImpl<$Res> extends _$SplitCopyWithImpl<$Res, _$_Split>
-    implements _$$_SplitCopyWith<$Res> {
-  __$$_SplitCopyWithImpl(_$_Split _value, $Res Function(_$_Split) _then)
+class __$$SplitImplCopyWithImpl<$Res>
+    extends _$SplitCopyWithImpl<$Res, _$SplitImpl>
+    implements _$$SplitImplCopyWith<$Res> {
+  __$$SplitImplCopyWithImpl(
+      _$SplitImpl _value, $Res Function(_$SplitImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -100,7 +103,7 @@ class __$$_SplitCopyWithImpl<$Res> extends _$SplitCopyWithImpl<$Res, _$_Split>
     Object? variants = null,
     Object? isFeatureGate = null,
   }) {
-    return _then(_$_Split(
+    return _then(_$SplitImpl(
       name: null == name
           ? _value.name
           : name // ignore: cast_nullable_to_non_nullable
@@ -119,15 +122,15 @@ class __$$_SplitCopyWithImpl<$Res> extends _$SplitCopyWithImpl<$Res, _$_Split>
 
 /// @nodoc
 @JsonSerializable()
-class _$_Split implements _Split {
-  const _$_Split(
+class _$SplitImpl implements _Split {
+  const _$SplitImpl(
       {required this.name,
       required final List<Variant> variants,
       @JsonKey(name: 'feature_gate') required this.isFeatureGate})
       : _variants = variants;
 
-  factory _$_Split.fromJson(Map<String, dynamic> json) =>
-      _$$_SplitFromJson(json);
+  factory _$SplitImpl.fromJson(Map<String, dynamic> json) =>
+      _$$SplitImplFromJson(json);
 
   @override
   final String name;
@@ -152,7 +155,7 @@ class _$_Split implements _Split {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Split &&
+            other is _$SplitImpl &&
             (identical(other.name, name) || other.name == name) &&
             const DeepCollectionEquality().equals(other._variants, _variants) &&
             (identical(other.isFeatureGate, isFeatureGate) ||
@@ -167,12 +170,12 @@ class _$_Split implements _Split {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_SplitCopyWith<_$_Split> get copyWith =>
-      __$$_SplitCopyWithImpl<_$_Split>(this, _$identity);
+  _$$SplitImplCopyWith<_$SplitImpl> get copyWith =>
+      __$$SplitImplCopyWithImpl<_$SplitImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_SplitToJson(
+    return _$$SplitImplToJson(
       this,
     );
   }
@@ -183,9 +186,9 @@ abstract class _Split implements Split {
           {required final String name,
           required final List<Variant> variants,
           @JsonKey(name: 'feature_gate') required final bool isFeatureGate}) =
-      _$_Split;
+      _$SplitImpl;
 
-  factory _Split.fromJson(Map<String, dynamic> json) = _$_Split.fromJson;
+  factory _Split.fromJson(Map<String, dynamic> json) = _$SplitImpl.fromJson;
 
   @override
   String get name;
@@ -196,6 +199,6 @@ abstract class _Split implements Split {
   bool get isFeatureGate;
   @override
   @JsonKey(ignore: true)
-  _$$_SplitCopyWith<_$_Split> get copyWith =>
+  _$$SplitImplCopyWith<_$SplitImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/split.g.dart b/packages/test_track/lib/src/models/split.g.dart
index 100a863..25d13bc 100644
--- a/packages/test_track/lib/src/models/split.g.dart
+++ b/packages/test_track/lib/src/models/split.g.dart
@@ -8,11 +8,11 @@ part of 'split.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_Split _$$_SplitFromJson(Map<String, dynamic> json) => $checkedCreate(
-      r'_$_Split',
+_$SplitImpl _$$SplitImplFromJson(Map<String, dynamic> json) => $checkedCreate(
+      r'_$SplitImpl',
       json,
       ($checkedConvert) {
-        final val = _$_Split(
+        final val = _$SplitImpl(
           name: $checkedConvert('name', (v) => v as String),
           variants: $checkedConvert(
               'variants',
@@ -26,7 +26,8 @@ _$_Split _$$_SplitFromJson(Map<String, dynamic> json) => $checkedCreate(
       fieldKeyMap: const {'isFeatureGate': 'feature_gate'},
     );
 
-Map<String, dynamic> _$$_SplitToJson(_$_Split instance) => <String, dynamic>{
+Map<String, dynamic> _$$SplitImplToJson(_$SplitImpl instance) =>
+    <String, dynamic>{
       'name': instance.name,
       'variants': instance.variants.map((e) => e.toJson()).toList(),
       'feature_gate': instance.isFeatureGate,
diff --git a/packages/test_track/lib/src/models/split_registry.freezed.dart b/packages/test_track/lib/src/models/split_registry.freezed.dart
index bb583fc..d4e1acb 100644
--- a/packages/test_track/lib/src/models/split_registry.freezed.dart
+++ b/packages/test_track/lib/src/models/split_registry.freezed.dart
@@ -62,22 +62,22 @@ class _$SplitRegistryCopyWithImpl<$Res, $Val extends SplitRegistry>
 }
 
 /// @nodoc
-abstract class _$$_SplitRegistryCopyWith<$Res>
+abstract class _$$SplitRegistryImplCopyWith<$Res>
     implements $SplitRegistryCopyWith<$Res> {
-  factory _$$_SplitRegistryCopyWith(
-          _$_SplitRegistry value, $Res Function(_$_SplitRegistry) then) =
-      __$$_SplitRegistryCopyWithImpl<$Res>;
+  factory _$$SplitRegistryImplCopyWith(
+          _$SplitRegistryImpl value, $Res Function(_$SplitRegistryImpl) then) =
+      __$$SplitRegistryImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({List<Split> splits});
 }
 
 /// @nodoc
-class __$$_SplitRegistryCopyWithImpl<$Res>
-    extends _$SplitRegistryCopyWithImpl<$Res, _$_SplitRegistry>
-    implements _$$_SplitRegistryCopyWith<$Res> {
-  __$$_SplitRegistryCopyWithImpl(
-      _$_SplitRegistry _value, $Res Function(_$_SplitRegistry) _then)
+class __$$SplitRegistryImplCopyWithImpl<$Res>
+    extends _$SplitRegistryCopyWithImpl<$Res, _$SplitRegistryImpl>
+    implements _$$SplitRegistryImplCopyWith<$Res> {
+  __$$SplitRegistryImplCopyWithImpl(
+      _$SplitRegistryImpl _value, $Res Function(_$SplitRegistryImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -85,7 +85,7 @@ class __$$_SplitRegistryCopyWithImpl<$Res>
   $Res call({
     Object? splits = null,
   }) {
-    return _then(_$_SplitRegistry(
+    return _then(_$SplitRegistryImpl(
       splits: null == splits
           ? _value._splits
           : splits // ignore: cast_nullable_to_non_nullable
@@ -96,11 +96,11 @@ class __$$_SplitRegistryCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_SplitRegistry implements _SplitRegistry {
-  _$_SplitRegistry({required final List<Split> splits}) : _splits = splits;
+class _$SplitRegistryImpl implements _SplitRegistry {
+  _$SplitRegistryImpl({required final List<Split> splits}) : _splits = splits;
 
-  factory _$_SplitRegistry.fromJson(Map<String, dynamic> json) =>
-      _$$_SplitRegistryFromJson(json);
+  factory _$SplitRegistryImpl.fromJson(Map<String, dynamic> json) =>
+      _$$SplitRegistryImplFromJson(json);
 
   final List<Split> _splits;
   @override
@@ -119,7 +119,7 @@ class _$_SplitRegistry implements _SplitRegistry {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_SplitRegistry &&
+            other is _$SplitRegistryImpl &&
             const DeepCollectionEquality().equals(other._splits, _splits));
   }
 
@@ -131,12 +131,12 @@ class _$_SplitRegistry implements _SplitRegistry {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_SplitRegistryCopyWith<_$_SplitRegistry> get copyWith =>
-      __$$_SplitRegistryCopyWithImpl<_$_SplitRegistry>(this, _$identity);
+  _$$SplitRegistryImplCopyWith<_$SplitRegistryImpl> get copyWith =>
+      __$$SplitRegistryImplCopyWithImpl<_$SplitRegistryImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_SplitRegistryToJson(
+    return _$$SplitRegistryImplToJson(
       this,
     );
   }
@@ -144,15 +144,15 @@ class _$_SplitRegistry implements _SplitRegistry {
 
 abstract class _SplitRegistry implements SplitRegistry {
   factory _SplitRegistry({required final List<Split> splits}) =
-      _$_SplitRegistry;
+      _$SplitRegistryImpl;
 
   factory _SplitRegistry.fromJson(Map<String, dynamic> json) =
-      _$_SplitRegistry.fromJson;
+      _$SplitRegistryImpl.fromJson;
 
   @override
   List<Split> get splits;
   @override
   @JsonKey(ignore: true)
-  _$$_SplitRegistryCopyWith<_$_SplitRegistry> get copyWith =>
+  _$$SplitRegistryImplCopyWith<_$SplitRegistryImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/split_registry.g.dart b/packages/test_track/lib/src/models/split_registry.g.dart
index 4a1acd7..69b6a33 100644
--- a/packages/test_track/lib/src/models/split_registry.g.dart
+++ b/packages/test_track/lib/src/models/split_registry.g.dart
@@ -8,12 +8,12 @@ part of 'split_registry.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_SplitRegistry _$$_SplitRegistryFromJson(Map<String, dynamic> json) =>
+_$SplitRegistryImpl _$$SplitRegistryImplFromJson(Map<String, dynamic> json) =>
     $checkedCreate(
-      r'_$_SplitRegistry',
+      r'_$SplitRegistryImpl',
       json,
       ($checkedConvert) {
-        final val = _$_SplitRegistry(
+        final val = _$SplitRegistryImpl(
           splits: $checkedConvert(
               'splits',
               (v) => (v as List<dynamic>)
@@ -24,7 +24,7 @@ _$_SplitRegistry _$$_SplitRegistryFromJson(Map<String, dynamic> json) =>
       },
     );
 
-Map<String, dynamic> _$$_SplitRegistryToJson(_$_SplitRegistry instance) =>
+Map<String, dynamic> _$$SplitRegistryImplToJson(_$SplitRegistryImpl instance) =>
     <String, dynamic>{
       'splits': instance.splits.map((e) => e.toJson()).toList(),
     };
diff --git a/packages/test_track/lib/src/models/variant.freezed.dart b/packages/test_track/lib/src/models/variant.freezed.dart
index 54c6e53..7820f9e 100644
--- a/packages/test_track/lib/src/models/variant.freezed.dart
+++ b/packages/test_track/lib/src/models/variant.freezed.dart
@@ -66,20 +66,21 @@ class _$VariantCopyWithImpl<$Res, $Val extends Variant>
 }
 
 /// @nodoc
-abstract class _$$_VariantCopyWith<$Res> implements $VariantCopyWith<$Res> {
-  factory _$$_VariantCopyWith(
-          _$_Variant value, $Res Function(_$_Variant) then) =
-      __$$_VariantCopyWithImpl<$Res>;
+abstract class _$$VariantImplCopyWith<$Res> implements $VariantCopyWith<$Res> {
+  factory _$$VariantImplCopyWith(
+          _$VariantImpl value, $Res Function(_$VariantImpl) then) =
+      __$$VariantImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({String name, int weight});
 }
 
 /// @nodoc
-class __$$_VariantCopyWithImpl<$Res>
-    extends _$VariantCopyWithImpl<$Res, _$_Variant>
-    implements _$$_VariantCopyWith<$Res> {
-  __$$_VariantCopyWithImpl(_$_Variant _value, $Res Function(_$_Variant) _then)
+class __$$VariantImplCopyWithImpl<$Res>
+    extends _$VariantCopyWithImpl<$Res, _$VariantImpl>
+    implements _$$VariantImplCopyWith<$Res> {
+  __$$VariantImplCopyWithImpl(
+      _$VariantImpl _value, $Res Function(_$VariantImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -88,7 +89,7 @@ class __$$_VariantCopyWithImpl<$Res>
     Object? name = null,
     Object? weight = null,
   }) {
-    return _then(_$_Variant(
+    return _then(_$VariantImpl(
       name: null == name
           ? _value.name
           : name // ignore: cast_nullable_to_non_nullable
@@ -103,11 +104,11 @@ class __$$_VariantCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_Variant implements _Variant {
-  const _$_Variant({required this.name, required this.weight});
+class _$VariantImpl implements _Variant {
+  const _$VariantImpl({required this.name, required this.weight});
 
-  factory _$_Variant.fromJson(Map<String, dynamic> json) =>
-      _$$_VariantFromJson(json);
+  factory _$VariantImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VariantImplFromJson(json);
 
   @override
   final String name;
@@ -123,7 +124,7 @@ class _$_Variant implements _Variant {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Variant &&
+            other is _$VariantImpl &&
             (identical(other.name, name) || other.name == name) &&
             (identical(other.weight, weight) || other.weight == weight));
   }
@@ -135,12 +136,12 @@ class _$_Variant implements _Variant {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VariantCopyWith<_$_Variant> get copyWith =>
-      __$$_VariantCopyWithImpl<_$_Variant>(this, _$identity);
+  _$$VariantImplCopyWith<_$VariantImpl> get copyWith =>
+      __$$VariantImplCopyWithImpl<_$VariantImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VariantToJson(
+    return _$$VariantImplToJson(
       this,
     );
   }
@@ -148,9 +149,9 @@ class _$_Variant implements _Variant {
 
 abstract class _Variant implements Variant {
   const factory _Variant(
-      {required final String name, required final int weight}) = _$_Variant;
+      {required final String name, required final int weight}) = _$VariantImpl;
 
-  factory _Variant.fromJson(Map<String, dynamic> json) = _$_Variant.fromJson;
+  factory _Variant.fromJson(Map<String, dynamic> json) = _$VariantImpl.fromJson;
 
   @override
   String get name;
@@ -158,6 +159,6 @@ abstract class _Variant implements Variant {
   int get weight;
   @override
   @JsonKey(ignore: true)
-  _$$_VariantCopyWith<_$_Variant> get copyWith =>
+  _$$VariantImplCopyWith<_$VariantImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/variant.g.dart b/packages/test_track/lib/src/models/variant.g.dart
index 71b799f..2271117 100644
--- a/packages/test_track/lib/src/models/variant.g.dart
+++ b/packages/test_track/lib/src/models/variant.g.dart
@@ -8,11 +8,12 @@ part of 'variant.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_Variant _$$_VariantFromJson(Map<String, dynamic> json) => $checkedCreate(
-      r'_$_Variant',
+_$VariantImpl _$$VariantImplFromJson(Map<String, dynamic> json) =>
+    $checkedCreate(
+      r'_$VariantImpl',
       json,
       ($checkedConvert) {
-        final val = _$_Variant(
+        final val = _$VariantImpl(
           name: $checkedConvert('name', (v) => v as String),
           weight: $checkedConvert('weight', (v) => v as int),
         );
@@ -20,7 +21,7 @@ _$_Variant _$$_VariantFromJson(Map<String, dynamic> json) => $checkedCreate(
       },
     );
 
-Map<String, dynamic> _$$_VariantToJson(_$_Variant instance) =>
+Map<String, dynamic> _$$VariantImplToJson(_$VariantImpl instance) =>
     <String, dynamic>{
       'name': instance.name,
       'weight': instance.weight,
diff --git a/packages/test_track/lib/src/models/visitor.freezed.dart b/packages/test_track/lib/src/models/visitor.freezed.dart
index 0be2daa..20f6ff5 100644
--- a/packages/test_track/lib/src/models/visitor.freezed.dart
+++ b/packages/test_track/lib/src/models/visitor.freezed.dart
@@ -66,20 +66,21 @@ class _$VisitorCopyWithImpl<$Res, $Val extends Visitor>
 }
 
 /// @nodoc
-abstract class _$$_VisitorCopyWith<$Res> implements $VisitorCopyWith<$Res> {
-  factory _$$_VisitorCopyWith(
-          _$_Visitor value, $Res Function(_$_Visitor) then) =
-      __$$_VisitorCopyWithImpl<$Res>;
+abstract class _$$VisitorImplCopyWith<$Res> implements $VisitorCopyWith<$Res> {
+  factory _$$VisitorImplCopyWith(
+          _$VisitorImpl value, $Res Function(_$VisitorImpl) then) =
+      __$$VisitorImplCopyWithImpl<$Res>;
   @override
   @useResult
   $Res call({List<Assignment> assignments, String id});
 }
 
 /// @nodoc
-class __$$_VisitorCopyWithImpl<$Res>
-    extends _$VisitorCopyWithImpl<$Res, _$_Visitor>
-    implements _$$_VisitorCopyWith<$Res> {
-  __$$_VisitorCopyWithImpl(_$_Visitor _value, $Res Function(_$_Visitor) _then)
+class __$$VisitorImplCopyWithImpl<$Res>
+    extends _$VisitorCopyWithImpl<$Res, _$VisitorImpl>
+    implements _$$VisitorImplCopyWith<$Res> {
+  __$$VisitorImplCopyWithImpl(
+      _$VisitorImpl _value, $Res Function(_$VisitorImpl) _then)
       : super(_value, _then);
 
   @pragma('vm:prefer-inline')
@@ -88,7 +89,7 @@ class __$$_VisitorCopyWithImpl<$Res>
     Object? assignments = null,
     Object? id = null,
   }) {
-    return _then(_$_Visitor(
+    return _then(_$VisitorImpl(
       assignments: null == assignments
           ? _value._assignments
           : assignments // ignore: cast_nullable_to_non_nullable
@@ -103,13 +104,13 @@ class __$$_VisitorCopyWithImpl<$Res>
 
 /// @nodoc
 @JsonSerializable()
-class _$_Visitor implements _Visitor {
-  const _$_Visitor(
+class _$VisitorImpl implements _Visitor {
+  const _$VisitorImpl(
       {required final List<Assignment> assignments, required this.id})
       : _assignments = assignments;
 
-  factory _$_Visitor.fromJson(Map<String, dynamic> json) =>
-      _$$_VisitorFromJson(json);
+  factory _$VisitorImpl.fromJson(Map<String, dynamic> json) =>
+      _$$VisitorImplFromJson(json);
 
   final List<Assignment> _assignments;
   @override
@@ -131,7 +132,7 @@ class _$_Visitor implements _Visitor {
   bool operator ==(dynamic other) {
     return identical(this, other) ||
         (other.runtimeType == runtimeType &&
-            other is _$_Visitor &&
+            other is _$VisitorImpl &&
             const DeepCollectionEquality()
                 .equals(other._assignments, _assignments) &&
             (identical(other.id, id) || other.id == id));
@@ -145,12 +146,12 @@ class _$_Visitor implements _Visitor {
   @JsonKey(ignore: true)
   @override
   @pragma('vm:prefer-inline')
-  _$$_VisitorCopyWith<_$_Visitor> get copyWith =>
-      __$$_VisitorCopyWithImpl<_$_Visitor>(this, _$identity);
+  _$$VisitorImplCopyWith<_$VisitorImpl> get copyWith =>
+      __$$VisitorImplCopyWithImpl<_$VisitorImpl>(this, _$identity);
 
   @override
   Map<String, dynamic> toJson() {
-    return _$$_VisitorToJson(
+    return _$$VisitorImplToJson(
       this,
     );
   }
@@ -159,9 +160,9 @@ class _$_Visitor implements _Visitor {
 abstract class _Visitor implements Visitor {
   const factory _Visitor(
       {required final List<Assignment> assignments,
-      required final String id}) = _$_Visitor;
+      required final String id}) = _$VisitorImpl;
 
-  factory _Visitor.fromJson(Map<String, dynamic> json) = _$_Visitor.fromJson;
+  factory _Visitor.fromJson(Map<String, dynamic> json) = _$VisitorImpl.fromJson;
 
   @override
   List<Assignment> get assignments;
@@ -169,6 +170,6 @@ abstract class _Visitor implements Visitor {
   String get id;
   @override
   @JsonKey(ignore: true)
-  _$$_VisitorCopyWith<_$_Visitor> get copyWith =>
+  _$$VisitorImplCopyWith<_$VisitorImpl> get copyWith =>
       throw _privateConstructorUsedError;
 }
diff --git a/packages/test_track/lib/src/models/visitor.g.dart b/packages/test_track/lib/src/models/visitor.g.dart
index 1615808..3ce7431 100644
--- a/packages/test_track/lib/src/models/visitor.g.dart
+++ b/packages/test_track/lib/src/models/visitor.g.dart
@@ -8,11 +8,12 @@ part of 'visitor.dart';
 // JsonSerializableGenerator
 // **************************************************************************
 
-_$_Visitor _$$_VisitorFromJson(Map<String, dynamic> json) => $checkedCreate(
-      r'_$_Visitor',
+_$VisitorImpl _$$VisitorImplFromJson(Map<String, dynamic> json) =>
+    $checkedCreate(
+      r'_$VisitorImpl',
       json,
       ($checkedConvert) {
-        final val = _$_Visitor(
+        final val = _$VisitorImpl(
           assignments: $checkedConvert(
               'assignments',
               (v) => (v as List<dynamic>)
@@ -24,7 +25,7 @@ _$_Visitor _$$_VisitorFromJson(Map<String, dynamic> json) => $checkedCreate(
       },
     );
 
-Map<String, dynamic> _$$_VisitorToJson(_$_Visitor instance) =>
+Map<String, dynamic> _$$VisitorImplToJson(_$VisitorImpl instance) =>
     <String, dynamic>{
       'assignments': instance.assignments.map((e) => e.toJson()).toList(),
       'id': instance.id,
diff --git a/packages/test_track/lib/src/networking/extras.dart b/packages/test_track/lib/src/networking/extras.dart
index 4254d14..557faa9 100644
--- a/packages/test_track/lib/src/networking/extras.dart
+++ b/packages/test_track/lib/src/networking/extras.dart
@@ -10,9 +10,8 @@ const isIdempotentOptionsKey = 'is_idempotent';
 /// A convenience class for producing a [GetRequest] that contains the
 /// [isIdempotentOptionsKey]
 class IdempotentGetRequest extends GetRequest {
-  IdempotentGetRequest(String path)
+  IdempotentGetRequest(super.path)
       : super(
-          path,
           options: Options(
             extra: {
               isIdempotentOptionsKey: true,
@@ -25,11 +24,9 @@ class IdempotentGetRequest extends GetRequest {
 /// [isIdempotentOptionsKey]
 class IdempotentPostRequest extends PostRequest {
   IdempotentPostRequest(
-    String path, {
-    required NetworkRequestBody data,
+    super.path, {
+    required super.data,
   }) : super(
-          path,
-          data: data,
           options: Options(
             extra: {
               isIdempotentOptionsKey: true,
diff --git a/packages/test_track/pubspec.yaml b/packages/test_track/pubspec.yaml
index 8dcf788..774bca8 100644
--- a/packages/test_track/pubspec.yaml
+++ b/packages/test_track/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/Betterment/test_track_dart_client
 repository: https://github.com/Betterment/test_track_dart_client
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=3.0.7 <4.0.0"
 
 dependencies:
   collection: ^1.17.1
@@ -15,18 +15,18 @@ dependencies:
   freezed_annotation: ^2.1.0
   json_annotation: ^4.8.0
   meta: ^1.9.0
-  sturdy_http: ^0.1.0
-  uuid: ^3.0.7
+  sturdy_http: ^0.2.0
+  uuid: ^4.1.0
 
 
 dev_dependencies:
   build_runner: ^2.3.3
-  charlatan: ^0.3.1
+  charlatan: ^0.4.0
   coverage: ^1.6.3
   fake_async: ^1.2.0
   freezed: ^2.3.2
   json_serializable: ^6.0.1
-  lints: ^2.0.1
-  mocktail: ^0.3.0
+  lints: ^3.0.0
+  mocktail: ^1.0.1
   test: ^1.17.7
   test_track_test_support: ^0.1.0
diff --git a/packages/test_track/test/domain/override_assignments_test.dart b/packages/test_track/test/domain/override_assignments_test.dart
index a213e96..270dbd9 100644
--- a/packages/test_track/test/domain/override_assignments_test.dart
+++ b/packages/test_track/test/domain/override_assignments_test.dart
@@ -43,10 +43,10 @@ void main() {
             '/api/v2/visitors/$visitorId/assignment_overrides',
             (request) {
               final data = request.body as Map<String, Object?>?;
-              return assignmentsFromRequest =
+              assignmentsFromRequest =
                   data?['assignments'] as List<Map<String, Object?>>?;
+              return CharlatanHttpResponse(statusCode: 204);
             },
-            statusCode: 204,
           )
           ..whenGetVisitorConfig(
             response: AppVisitorConfig(
diff --git a/packages/test_track/test/domain/test_track_login_test.dart b/packages/test_track/test/domain/test_track_login_test.dart
index 58e3948..c47cc80 100644
--- a/packages/test_track/test/domain/test_track_login_test.dart
+++ b/packages/test_track/test/domain/test_track_login_test.dart
@@ -51,7 +51,7 @@ void main() {
               visitorIdFromRequest = data?['visitor_id'] as String?;
               isIdempotent =
                   request.requestOptions.extra['is_idempotent'] as bool;
-              return appVisitorConfig.toJson();
+              return CharlatanHttpResponse(body: appVisitorConfig.toJson());
             },
           );
         });
diff --git a/packages/test_track/test/networking/fakes/fake_http_defaults.dart b/packages/test_track/test/networking/fakes/fake_http_defaults.dart
index 948e642..35d4579 100644
--- a/packages/test_track/test/networking/fakes/fake_http_defaults.dart
+++ b/packages/test_track/test/networking/fakes/fake_http_defaults.dart
@@ -15,7 +15,8 @@ extension FakeHttpDefaults on Charlatan {
   void withDefaults() {
     this
       ..whenGetVisitorConfig(response: AppVisitorConfigFactory.build())
-      ..whenPost('/api/v1/assignment_event', (request) => null);
+      ..whenPost(
+          '/api/v1/assignment_event', (request) => CharlatanHttpResponse());
   }
 
   /// Convenience method to set the returned
@@ -26,7 +27,9 @@ extension FakeHttpDefaults on Charlatan {
   }) {
     whenGet(
       '/api/v4/apps/{appName}/versions/{version}/builds/{buildTimestamp}/visitors/{visitorId}/config',
-      (request) => response,
+      (request) => CharlatanHttpResponse(
+        body: response.toJson(),
+      ),
     );
   }
 
diff --git a/packages/test_track/test/test_track_test.dart b/packages/test_track/test/test_track_test.dart
index 8437798..b0a46d5 100644
--- a/packages/test_track/test/test_track_test.dart
+++ b/packages/test_track/test/test_track_test.dart
@@ -223,12 +223,15 @@ void main() {
       setUp(() async {
         charlatan.whenPost(
           '/api/v4/apps/${appVersionBuild.appName}/versions/${appVersionBuild.version}/builds/${appVersionBuild.buildTimestamp}/identifier',
-          (request) => appVisitorConfig
-              .copyWith(
-                visitor: appVisitorConfig.visitor.copyWith(id: 'post-login-id'),
-                splits: SplitRegistry.empty().splits,
-              )
-              .toJson(),
+          (request) => CharlatanHttpResponse(
+            body: appVisitorConfig
+                .copyWith(
+                  visitor:
+                      appVisitorConfig.visitor.copyWith(id: 'post-login-id'),
+                  splits: SplitRegistry.empty().splits,
+                )
+                .toJson(),
+          ),
         );
         subject = await buildSubject();
       });
@@ -240,7 +243,7 @@ void main() {
           '/api/v4/apps/${appVersionBuild.appName}/versions/${appVersionBuild.version}/builds/${appVersionBuild.buildTimestamp}/identifier',
           (request) {
             linkIdentifierCalled = true;
-            return appVisitorConfig.toJson();
+            return CharlatanHttpResponse(body: appVisitorConfig.toJson());
           },
         );
 
@@ -275,8 +278,9 @@ void main() {
         test('it completes normally and logs an info', () async {
           charlatan.whenPost(
             '/api/v4/apps/${appVersionBuild.appName}/versions/${appVersionBuild.version}/builds/${appVersionBuild.buildTimestamp}/identifier',
-            (request) => null,
-            statusCode: 500,
+            (request) => CharlatanHttpResponse(
+              statusCode: 500,
+            ),
           );
 
           final result = subject.login(identifierType: 'foo', value: '123');
diff --git a/packages/test_track_test_support/lib/src/factories/split_factory.dart b/packages/test_track_test_support/lib/src/factories/split_factory.dart
index 523c48e..ebee6fe 100644
--- a/packages/test_track_test_support/lib/src/factories/split_factory.dart
+++ b/packages/test_track_test_support/lib/src/factories/split_factory.dart
@@ -11,9 +11,9 @@ import 'package:test_track_test_support/test_track_test_support.dart';
 class SplitFactory {
   /// {@macro split_factory}
   static Split build({bool? isFeatureGate}) {
-    final _isFeatureGate = isFeatureGate ?? Random().nextBool();
+    final isFeatureGateResolved = isFeatureGate ?? Random().nextBool();
     final variants = () {
-      if (_isFeatureGate) {
+      if (isFeatureGateResolved) {
         return const [
           Variant(name: 'true', weight: 50),
           Variant(name: 'false', weight: 50),
@@ -33,11 +33,11 @@ class SplitFactory {
     }();
 
     return Split(
-      name: _isFeatureGate
+      name: isFeatureGateResolved
           ? 'split-${randomAlphaNumeric(10)}_enabled'
           : 'split-${randomAlphaNumeric(10)}_experiment',
       variants: variants,
-      isFeatureGate: _isFeatureGate,
+      isFeatureGate: isFeatureGateResolved,
     );
   }
 }
diff --git a/packages/test_track_test_support/lib/src/fake_test_track.dart b/packages/test_track_test_support/lib/src/fake_test_track.dart
index be43be0..3ffda16 100644
--- a/packages/test_track_test_support/lib/src/fake_test_track.dart
+++ b/packages/test_track_test_support/lib/src/fake_test_track.dart
@@ -122,13 +122,11 @@ class FakeTestTrack implements TestTrack {
   }) async {
     _visitor = _visitor.copyWith(assignments: [
       ..._visitor.assignments,
-      ...assignmentOverrides
-          .map((e) => Assignment(
-                splitName: e.splitName,
-                variant: e.variant,
-                context: e.context,
-              ))
-          .toList(),
+      ...assignmentOverrides.map((e) => Assignment(
+            splitName: e.splitName,
+            variant: e.variant,
+            context: e.context,
+          )),
     ]);
   }
 }
diff --git a/packages/test_track_test_support/pubspec.yaml b/packages/test_track_test_support/pubspec.yaml
index 7922514..502281d 100644
--- a/packages/test_track_test_support/pubspec.yaml
+++ b/packages/test_track_test_support/pubspec.yaml
@@ -5,7 +5,7 @@ homepage: https://github.com/Betterment/test_track_dart_client
 repository: https://github.com/Betterment/test_track_dart_client
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=3.0.7 <4.0.0"
 
 dependencies:
   equatable: ^2.0.3
@@ -15,5 +15,5 @@ dependencies:
 
 dev_dependencies:
   coverage: ^1.0.3
-  lints: ^1.0.1
+  lints: ^3.0.0
   test: ^1.16.0
diff --git a/pubspec.yaml b/pubspec.yaml
index addc2bf..50a9bf5 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: test_track_workspace
 
 environment:
-  sdk: ">=2.15.0 <3.0.0"
+  sdk: ">=3.0.7 <4.0.0"
 dev_dependencies:
-  melos: ^3.1.0
+  melos: ^3.2.0