diff --git a/AmplifyPlugins/Core/AWSPluginsCoreTests/Auth/AuthModeStrategyTests.swift b/AmplifyPlugins/Core/AWSPluginsCoreTests/Auth/AuthModeStrategyTests.swift
index 76933a96eb..435bb37ba8 100644
--- a/AmplifyPlugins/Core/AWSPluginsCoreTests/Auth/AuthModeStrategyTests.swift
+++ b/AmplifyPlugins/Core/AWSPluginsCoreTests/Auth/AuthModeStrategyTests.swift
@@ -159,14 +159,14 @@ class AuthModeStrategyTests: XCTestCase {
 
 /// Model with two auth rules
 private struct ModelWithOwnerAndPublicAuth: Model {
-    public let id: String
+    let id: String
 
-    public enum CodingKeys: String, ModelKey {
+    enum CodingKeys: String, ModelKey {
         case id
     }
-    public static let keys = CodingKeys.self
+    static let keys = CodingKeys.self
 
-    public static let schema = defineSchema { model in
+    static let schema = defineSchema { model in
         model.authRules = [
             rule(allow: .owner, provider: .userPools, operations: [.create, .read, .update, .delete]),
             rule(allow: .public, provider: .apiKey, operations: [.create, .read, .update, .delete])
@@ -176,14 +176,14 @@ private struct ModelWithOwnerAndPublicAuth: Model {
 
 /// Model with multiple auth rules with equal strategy
 private struct ModelWithMultiplePublicRules: Model {
-    public let id: String
+    let id: String
 
-    public enum CodingKeys: String, ModelKey {
+    enum CodingKeys: String, ModelKey {
         case id
     }
-    public static let keys = CodingKeys.self
+    static let keys = CodingKeys.self
 
-    public static let schema = defineSchema { model in
+    static let schema = defineSchema { model in
         model.authRules = [
             rule(allow: .public, provider: .iam, operations: [.create, .read, .update, .delete]),
             rule(allow: .public, provider: .apiKey, operations: [.create, .read, .update, .delete]),
@@ -195,14 +195,14 @@ private struct ModelWithMultiplePublicRules: Model {
 
 /// Model with two auth rules but no auth provider
 private struct ModelNoProvider: Model {
-    public let id: String
+    let id: String
 
-    public enum CodingKeys: String, ModelKey {
+    enum CodingKeys: String, ModelKey {
         case id
     }
-    public static let keys = CodingKeys.self
+    static let keys = CodingKeys.self
 
-    public static let schema = defineSchema { model in
+    static let schema = defineSchema { model in
         model.authRules = [
             rule(allow: .owner, operations: [.create, .read, .update, .delete]),
             rule(allow: .public, operations: [.read])
@@ -212,14 +212,14 @@ private struct ModelNoProvider: Model {
 
 /// Model with multiple auth rules but no auth provider
 private struct ModelAllStrategies: Model {
-    public let id: String
+    let id: String
 
-    public enum CodingKeys: String, ModelKey {
+    enum CodingKeys: String, ModelKey {
         case id
     }
-    public static let keys = CodingKeys.self
+    static let keys = CodingKeys.self
 
-    public static let schema = defineSchema { model in
+    static let schema = defineSchema { model in
         model.authRules = [
             rule(allow: .owner, provider: .userPools, operations: [.create, .read, .update, .delete]),
             rule(allow: .public, provider: .iam, operations: [.read]),
@@ -231,14 +231,14 @@ private struct ModelAllStrategies: Model {
 
 /// Model with custom auth rule
 private struct ModelWithCustomStrategy: Model {
-    public let id: String
+    let id: String
 
-    public enum CodingKeys: String, ModelKey {
+    enum CodingKeys: String, ModelKey {
         case id
     }
-    public static let keys = CodingKeys.self
+    static let keys = CodingKeys.self
 
-    public static let schema = defineSchema { model in
+    static let schema = defineSchema { model in
         model.authRules = [
             rule(allow: .public, provider: .iam, operations: [.create, .read, .update, .delete]),
             rule(allow: .custom, provider: .function, operations: [.create, .read, .update, .delete]),
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthCognitoTests/AWSDataStoreCategoryPluginAuthIntegrationTests.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthCognitoTests/AWSDataStoreCategoryPluginAuthIntegrationTests.swift
index 70515e9d5b..b49e4df6ee 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthCognitoTests/AWSDataStoreCategoryPluginAuthIntegrationTests.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginAuthCognitoTests/AWSDataStoreCategoryPluginAuthIntegrationTests.swift
@@ -85,7 +85,7 @@ extension AWSDataStoreCategoryPluginAuthIntegrationTests {
     private struct ModelsRegistration: AmplifyModelRegistration {
         var version: String = "version"
 
-        public func registerModels(registry: ModelRegistry.Type) {
+        func registerModels(registry: ModelRegistry.Type) {
             ModelRegistry.register(modelType: TodoExplicitOwnerField.self)
             ModelRegistry.register(modelType: TodoImplicitOwnerField.self)
           }
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/16/AWSDataStoreAWSURLSortKeyTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/16/AWSDataStoreAWSURLSortKeyTest.swift
index e7785430f2..3f41ed0fb9 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/16/AWSDataStoreAWSURLSortKeyTest.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/16/AWSDataStoreAWSURLSortKeyTest.swift
@@ -23,7 +23,7 @@ private struct TestModels: AmplifyModelRegistration {
         ModelRegistry.register(modelType: Post16.self)
     }
 
-    public let version: String = "test"
+    let version: String = "test"
 }
 
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/17/AWSDataStoreAWSEmailSortKeyTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/17/AWSDataStoreAWSEmailSortKeyTest.swift
index 53b650e780..e7548fab85 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/17/AWSDataStoreAWSEmailSortKeyTest.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/17/AWSDataStoreAWSEmailSortKeyTest.swift
@@ -23,7 +23,7 @@ private struct TestModels: AmplifyModelRegistration {
         ModelRegistry.register(modelType: Post17.self)
     }
 
-    public let version: String = "test"
+    let version: String = "test"
 }
 
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/18/AWSDataStoreAWSPhoneSortKeyTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/18/AWSDataStoreAWSPhoneSortKeyTest.swift
index 33b422b510..24e679bc6d 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/18/AWSDataStoreAWSPhoneSortKeyTest.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/18/AWSDataStoreAWSPhoneSortKeyTest.swift
@@ -23,7 +23,7 @@ private struct TestModels: AmplifyModelRegistration {
         ModelRegistry.register(modelType: Post18.self)
     }
 
-    public let version: String = "test"
+    let version: String = "test"
 }
 
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/19/AWSDataStoreAWSIPAddressSortKeyTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/19/AWSDataStoreAWSIPAddressSortKeyTest.swift
index 065042f783..17f70a733d 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/19/AWSDataStoreAWSIPAddressSortKeyTest.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/19/AWSDataStoreAWSIPAddressSortKeyTest.swift
@@ -23,7 +23,7 @@ private struct TestModels: AmplifyModelRegistration {
         ModelRegistry.register(modelType: Post19.self)
     }
 
-    public let version: String = "test"
+    let version: String = "test"
 }
 
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/20/AWSDataStoreAWSTimestampSortKeyTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/20/AWSDataStoreAWSTimestampSortKeyTest.swift
index 12e981f542..cd9691b3a5 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/20/AWSDataStoreAWSTimestampSortKeyTest.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/20/AWSDataStoreAWSTimestampSortKeyTest.swift
@@ -23,7 +23,7 @@ private struct TestModels: AmplifyModelRegistration {
         ModelRegistry.register(modelType: Post20.self)
     }
 
-    public let version: String = "test"
+    let version: String = "test"
 }
 
 
diff --git a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/9/AWSDataStoreCompositeSortKeyIdentifierTest.swift b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/9/AWSDataStoreCompositeSortKeyIdentifierTest.swift
index 644b19e428..4428dfa6a7 100644
--- a/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/9/AWSDataStoreCompositeSortKeyIdentifierTest.swift
+++ b/AmplifyPlugins/DataStore/Tests/DataStoreHostApp/AWSDataStorePluginCPKTests/PrimaryKey/9/AWSDataStoreCompositeSortKeyIdentifierTest.swift
@@ -21,7 +21,7 @@ private struct TestModels: AmplifyModelRegistration {
         ModelRegistry.register(modelType: Comment9.self)
     }
 
-    public let version: String = "test"
+    let version: String = "test"
 }
 
 class AWSDataStoreCompositeSortKeyIdentifierTest: XCTestCase {