diff --git a/vChewingTests/KeyHandlerTestsNormalCHS.swift b/vChewingTests/KeyHandlerTestsNormalCHS.swift
index 9cb87cba..9600ee12 100644
--- a/vChewingTests/KeyHandlerTestsNormalCHS.swift
+++ b/vChewingTests/KeyHandlerTestsNormalCHS.swift
@@ -19,22 +19,22 @@ func charCode(_ string: String) -> UInt16 {
 
 class KeyHandlerTestsNormalCHS: XCTestCase {
   func reset() {
-    mgrPrefs.allKeys.forEach {
-      UserDefaults.standard.removeObject(forKey: $0)
+    UserDef.allCases.forEach {
+      UserDefaults.standard.removeObject(forKey: $0.rawValue)
     }
   }
 
   func makeSnapshot() -> [String: Any] {
     var dict = [String: Any]()
-    mgrPrefs.allKeys.forEach {
-      dict[$0] = UserDefaults.standard.object(forKey: $0)
+    UserDef.allCases.forEach {
+      dict[$0.rawValue] = UserDefaults.standard.object(forKey: $0.rawValue)
     }
     return dict
   }
 
   func restore(from snapshot: [String: Any]) {
-    mgrPrefs.allKeys.forEach {
-      UserDefaults.standard.set(snapshot[$0], forKey: $0)
+    UserDef.allCases.forEach {
+      UserDefaults.standard.set(snapshot[$0.rawValue], forKey: $0.rawValue)
     }
   }
 
diff --git a/vChewingTests/KeyHandlerTestsSCPCCHT.swift b/vChewingTests/KeyHandlerTestsSCPCCHT.swift
index 0e2846a2..4c1fd5f3 100644
--- a/vChewingTests/KeyHandlerTestsSCPCCHT.swift
+++ b/vChewingTests/KeyHandlerTestsSCPCCHT.swift
@@ -14,22 +14,22 @@ import XCTest
 
 class KeyHandlerTestsSCPCCHT: XCTestCase {
   func reset() {
-    mgrPrefs.allKeys.forEach {
-      UserDefaults.standard.removeObject(forKey: $0)
+    UserDef.allCases.forEach {
+      UserDefaults.standard.removeObject(forKey: $0.rawValue)
     }
   }
 
   func makeSnapshot() -> [String: Any] {
     var dict = [String: Any]()
-    mgrPrefs.allKeys.forEach {
-      dict[$0] = UserDefaults.standard.object(forKey: $0)
+    UserDef.allCases.forEach {
+      dict[$0.rawValue] = UserDefaults.standard.object(forKey: $0.rawValue)
     }
     return dict
   }
 
   func restore(from snapshot: [String: Any]) {
-    mgrPrefs.allKeys.forEach {
-      UserDefaults.standard.set(snapshot[$0], forKey: $0)
+    UserDef.allCases.forEach {
+      UserDefaults.standard.set(snapshot[$0.rawValue], forKey: $0.rawValue)
     }
   }
 
diff --git a/vChewingTests/PrefManagerTests.swift b/vChewingTests/PrefManagerTests.swift
index 206cb668..1b28ece1 100644
--- a/vChewingTests/PrefManagerTests.swift
+++ b/vChewingTests/PrefManagerTests.swift
@@ -14,22 +14,22 @@ import XCTest
 
 class PrefManagerTests: XCTestCase {
   func reset() {
-    mgrPrefs.allKeys.forEach {
-      UserDefaults.standard.removeObject(forKey: $0)
+    UserDef.allCases.forEach {
+      UserDefaults.standard.removeObject(forKey: $0.rawValue)
     }
   }
 
   func makeSnapshot() -> [String: Any] {
     var dict = [String: Any]()
-    mgrPrefs.allKeys.forEach {
-      dict[$0] = UserDefaults.standard.object(forKey: $0)
+    UserDef.allCases.forEach {
+      dict[$0.rawValue] = UserDefaults.standard.object(forKey: $0.rawValue)
     }
     return dict
   }
 
   func restore(from snapshot: [String: Any]) {
-    mgrPrefs.allKeys.forEach {
-      UserDefaults.standard.set(snapshot[$0], forKey: $0)
+    UserDef.allCases.forEach {
+      UserDefaults.standard.set(snapshot[$0.rawValue], forKey: $0.rawValue)
     }
   }