diff --git a/Sources/ElixxirDAppsSDK/GetGitVersion.swift b/Sources/ElixxirDAppsSDK/GetGitVersion.swift
new file mode 100644
index 0000000000000000000000000000000000000000..9eafe8b90f99a02f0a27a6fa50132b4d5952cc3d
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/GetGitVersion.swift
@@ -0,0 +1,22 @@
+import Bindings
+import XCTestDynamicOverlay
+
+public struct GetGitVersion {
+  public var run: () -> String
+
+  public func callAsFunction() -> String {
+    run()
+  }
+}
+
+extension GetGitVersion {
+  public static let live = GetGitVersion(
+    run: BindingsGetGitVersion
+  )
+}
+
+extension GetGitVersion {
+  public static let unimplemented = GetGitVersion(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}
diff --git a/Sources/ElixxirDAppsSDK/GetVersion.swift b/Sources/ElixxirDAppsSDK/GetVersion.swift
new file mode 100644
index 0000000000000000000000000000000000000000..eee1535c69deef010d0b09b5c881e1bbc439a00e
--- /dev/null
+++ b/Sources/ElixxirDAppsSDK/GetVersion.swift
@@ -0,0 +1,22 @@
+import Bindings
+import XCTestDynamicOverlay
+
+public struct GetVersion {
+  public var run: () -> String
+
+  public func callAsFunction() -> String {
+    run()
+  }
+}
+
+extension GetVersion {
+  public static let live = GetVersion(
+    run: BindingsGetVersion
+  )
+}
+
+extension GetVersion {
+  public static let unimplemented = GetVersion(
+    run: XCTUnimplemented("\(Self.self)")
+  )
+}
diff --git a/Sources/ElixxirDAppsSDK/Legacy/GitVersionProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/GitVersionProvider.swift
deleted file mode 100644
index 29ef07a39bff3323a95df2eb176985deb176e241..0000000000000000000000000000000000000000
--- a/Sources/ElixxirDAppsSDK/Legacy/GitVersionProvider.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-import Bindings
-
-public struct GitVersionProvider {
-  public var get: () -> String
-
-  public func callAsFunction() -> String {
-    get()
-  }
-}
-
-extension GitVersionProvider {
-  public static let live = GitVersionProvider(get: BindingsGetGitVersion)
-}
-
-#if DEBUG
-extension GitVersionProvider {
-  public static let failing = GitVersionProvider { fatalError("Not implemented") }
-}
-#endif
diff --git a/Sources/ElixxirDAppsSDK/Legacy/VersionProvider.swift b/Sources/ElixxirDAppsSDK/Legacy/VersionProvider.swift
deleted file mode 100644
index bec9b293ca43a57f42feb3a3f6a8703c239b613f..0000000000000000000000000000000000000000
--- a/Sources/ElixxirDAppsSDK/Legacy/VersionProvider.swift
+++ /dev/null
@@ -1,19 +0,0 @@
-import Bindings
-
-public struct VersionProvider {
-  public var get: () -> String
-
-  public func callAsFunction() -> String {
-    get()
-  }
-}
-
-extension VersionProvider {
-  public static let live = VersionProvider(get: BindingsGetVersion)
-}
-
-#if DEBUG
-extension VersionProvider {
-  public static let failing = VersionProvider { fatalError("Not implemented") }
-}
-#endif