diff --git a/app/build.gradle b/app/build.gradle
index 0c20386962..11556394cd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,11 +18,6 @@ repositories {
     google()
 }
 
-allOpen {
-    // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.androidaps.annotations.OpenForTesting'
-}
-
 def generateGitBuild = { ->
     StringBuilder stringBuilder = new StringBuilder()
     try {
diff --git a/core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt b/core/interfaces/src/debug/java/app/aaps/annotations/OpenForTesting.kt
similarity index 91%
rename from core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt
rename to core/interfaces/src/debug/java/app/aaps/annotations/OpenForTesting.kt
index 70d2a79124..7e97b21b6e 100644
--- a/core/interfaces/src/debug/java/info/nightscout/annotations/OpenForTesting.kt
+++ b/core/interfaces/src/debug/java/app/aaps/annotations/OpenForTesting.kt
@@ -1,4 +1,4 @@
-package info.nightscout.annotations
+package app.aaps.annotations
 
 /**
  * This is the actual annotation that makes the class open. Don't use it directly, only through [OpenForTesting]
diff --git a/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
index 166f009c0d..67a8731f8e 100644
--- a/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
+++ b/core/interfaces/src/main/java/info/nightscout/interfaces/plugin/PluginDescription.kt
@@ -1,6 +1,6 @@
 package info.nightscout.interfaces.plugin
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 
 @OpenForTesting
 class PluginDescription {
diff --git a/core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt b/core/interfaces/src/release/java/app/aaps/annotations/OpenForTesting.kt
similarity index 84%
rename from core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt
rename to core/interfaces/src/release/java/app/aaps/annotations/OpenForTesting.kt
index 4b300365c9..4783a1db97 100644
--- a/core/interfaces/src/release/java/info/nightscout/annotations/OpenForTesting.kt
+++ b/core/interfaces/src/release/java/app/aaps/annotations/OpenForTesting.kt
@@ -1,4 +1,4 @@
-package info.nightscout.annotations
+package app.aaps.annotations
 
 /**
  * Annotate a class with [OpenForTesting] if it should be extendable for testing.
diff --git a/core/main/allopen_dependencies.gradle b/core/main/allopen_dependencies.gradle
index 7fc69d2430..14416d2e8c 100644
--- a/core/main/allopen_dependencies.gradle
+++ b/core/main/allopen_dependencies.gradle
@@ -1,4 +1,4 @@
 allOpen {
     // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.annotations.OpenForTesting'
+    annotation 'app.aaps.annotations.OpenForTesting'
 }
diff --git a/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt b/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
index 81542cd91f..ffef1bb9b2 100644
--- a/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
+++ b/core/main/src/main/java/info/nightscout/core/utils/fabric/FabricPrivacy.kt
@@ -1,11 +1,11 @@
 package info.nightscout.core.utils.fabric
 
 import android.os.Bundle
+import app.aaps.annotations.OpenForTesting
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.ktx.analytics
 import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.firebase.ktx.Firebase
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.R
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
diff --git a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt b/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
index ff0d7ff78f..57e906887b 100644
--- a/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
+++ b/core/main/src/main/java/info/nightscout/core/wizard/QuickWizardEntry.kt
@@ -1,7 +1,7 @@
 package info.nightscout.core.wizard
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.extensions.valueToUnits
 import info.nightscout.core.iob.round
 import info.nightscout.core.utils.JsonHelper.safeGetInt
diff --git a/database/impl/build.gradle b/database/impl/build.gradle
index 10514f8669..dbfddb9ba3 100644
--- a/database/impl/build.gradle
+++ b/database/impl/build.gradle
@@ -50,9 +50,4 @@ dependencies {
     api "com.google.dagger:dagger-android-support:$dagger_version"
 
     androidTestImplementation "androidx.room:room-testing:$room_version"
-}
-
-allOpen {
-    // allows mocking for classes w/o directly opening them for release builds
-    annotation 'info.nightscout.database.annotations.DbOpenForTesting'
-}
+}
\ No newline at end of file
diff --git a/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt b/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt
index 30329133f3..5e81cd0a38 100644
--- a/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/DefaultValueHelperImpl.kt
@@ -1,6 +1,6 @@
 package info.nightscout.implementation
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.GlucoseUnit
 import info.nightscout.interfaces.profile.DefaultValueHelper
diff --git a/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt
index 9778cb6c80..b4d2aa73df 100644
--- a/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/HardLimitsImpl.kt
@@ -1,7 +1,7 @@
 package info.nightscout.implementation
 
 import android.content.Context
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.database.impl.transactions.InsertTherapyEventAnnouncementTransaction
 import info.nightscout.interfaces.ui.UiInteraction
diff --git a/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt b/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt
index d7448f40ec..a195032371 100644
--- a/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/UserEntryLoggerImpl.kt
@@ -1,7 +1,7 @@
 package info.nightscout.implementation
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.entities.UserEntry
 import info.nightscout.database.entities.UserEntry.Action
 import info.nightscout.database.entities.UserEntry.Sources
diff --git a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt b/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
index 5e2b1604e3..939105e9ef 100644
--- a/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/iob/GlucoseStatusProviderImpl.kt
@@ -1,7 +1,7 @@
 package info.nightscout.implementation.iob
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.iob.asRounded
 import info.nightscout.core.iob.log
 import info.nightscout.interfaces.iob.GlucoseStatus
diff --git a/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt b/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt
index 7ec805f1f4..310e6da7a3 100644
--- a/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/logging/LoggerUtilsImpl.kt
@@ -1,7 +1,7 @@
 package info.nightscout.implementation.logging
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.logging.LoggerUtils
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import javax.inject.Inject
diff --git a/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt b/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt
index 465bd81920..c8ae0e540e 100644
--- a/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/profiling/ProfilerImpl.kt
@@ -1,7 +1,7 @@
 package info.nightscout.implementation.profiling
 
+import app.aaps.annotations.OpenForTesting
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.profiling.Profiler
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt
index 27191d08e2..640218c596 100644
--- a/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/pump/DetailedBolusInfoStorageImpl.kt
@@ -1,8 +1,8 @@
 package info.nightscout.implementation.pump
 
+import app.aaps.annotations.OpenForTesting
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.implementation.R
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.DetailedBolusInfoStorage
diff --git a/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt b/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt
index a81073c577..f9fb5d8b75 100644
--- a/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/pump/TemporaryBasalStorageImpl.kt
@@ -1,6 +1,6 @@
 package info.nightscout.implementation.pump
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.interfaces.pump.TemporaryBasalStorage
 import info.nightscout.rx.logging.AAPSLogger
diff --git a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
index be0d1cd620..88256550f4 100644
--- a/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/queue/CommandQueueImplementation.kt
@@ -7,8 +7,8 @@ import android.os.HandlerThread
 import android.os.SystemClock
 import android.text.Spanned
 import androidx.appcompat.app.AppCompatActivity
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.getCustomizedName
diff --git a/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt b/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt
index 4d1afe9419..bec9d31cb5 100644
--- a/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt
+++ b/implementation/src/main/java/info/nightscout/implementation/receivers/ReceiverStatusStoreImpl.kt
@@ -2,7 +2,7 @@ package info.nightscout.implementation.receivers
 
 import android.content.Context
 import android.content.Intent
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.EventChargingState
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
index 7b5eeec332..4dbe3da996 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/loop/LoopPlugin.kt
@@ -12,8 +12,8 @@ import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
 import androidx.core.app.NotificationCompat
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.extensions.convertedToAbsolute
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
index fe391f9d3e..b53cf725d7 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSAMA/OpenAPSAMAPlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.aps.openAPSAMA
 
 import android.content.Context
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.extensions.target
 import info.nightscout.core.utils.MidnightUtils
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
index 22945e7c48..f3bb85762d 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/aps/openAPSSMBDynamicISF/OpenAPSSMBDynamicISFPlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.aps.openAPSSMBDynamicISF
 
 import android.content.Context
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.aps.DetermineBasalAdapter
 import info.nightscout.interfaces.bgQualityCheck.BgQualityCheck
diff --git a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt
index 828fa618b8..028b54ad5f 100644
--- a/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt
+++ b/plugins/aps/src/main/java/info/nightscout/plugins/general/autotune/AutotuneFS.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.general.autotune
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.logging.LoggerUtils
 import info.nightscout.plugins.general.autotune.data.ATProfile
 import info.nightscout.plugins.general.autotune.data.PreppedGlucose
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
index 7d2c20da06..67e7821063 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/AutomationPlugin.kt
@@ -4,8 +4,8 @@ import android.content.Context
 import android.os.Handler
 import android.os.HandlerThread
 import android.os.SystemClock
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.automation.actions.Action
 import info.nightscout.automation.actions.ActionAlarm
 import info.nightscout.automation.actions.ActionCarePortalEvent
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/services/LastLocationDataContainer.kt b/plugins/automation/src/main/java/info/nightscout/automation/services/LastLocationDataContainer.kt
index dcce6eedd3..a5b65f3cf0 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/services/LastLocationDataContainer.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/services/LastLocationDataContainer.kt
@@ -1,7 +1,7 @@
 package info.nightscout.automation.services
 
 import android.location.Location
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import javax.inject.Inject
 import javax.inject.Singleton
 
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt
index e905e42b0e..c4becdaac2 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/services/LocationServiceHelper.kt
@@ -5,7 +5,7 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.NotificationHolder
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt b/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt
index 3be56d6c11..4bfedf0de3 100644
--- a/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt
+++ b/plugins/automation/src/main/java/info/nightscout/automation/ui/TimerUtil.kt
@@ -3,7 +3,7 @@ package info.nightscout.automation.ui
 import android.content.Context
 import android.content.Intent
 import android.provider.AlarmClock
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.automation.R
 import info.nightscout.core.ui.toast.ToastUtils
 import javax.inject.Inject
diff --git a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt
index b9df6df566..f3b586016d 100644
--- a/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt
+++ b/plugins/configuration/src/main/kotlin/app/aaps/configuration/maintenance/PrefFileListProviderImpl.kt
@@ -2,13 +2,13 @@ package app.aaps.configuration.maintenance
 
 import android.content.Context
 import android.os.Environment
+import app.aaps.annotations.OpenForTesting
 import app.aaps.configuration.R
 import app.aaps.configuration.maintenance.data.PrefMetadataMap
 import app.aaps.configuration.maintenance.data.PrefsStatusImpl
 import app.aaps.configuration.maintenance.formats.EncryptedPrefsFormat
 import dagger.Lazy
 import dagger.Reusable
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Config
 import info.nightscout.interfaces.maintenance.PrefFileListProvider
 import info.nightscout.interfaces.maintenance.PrefMetadata
diff --git a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt
index 677d1d7709..5d9c7f1603 100644
--- a/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt
+++ b/plugins/constraints/src/main/java/info/nightscout/plugins/constraints/storage/StorageConstraintPlugin.kt
@@ -2,8 +2,8 @@ package info.nightscout.plugins.constraints.storage
 
 import android.os.Environment
 import android.os.StatFs
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.interfaces.constraints.Constraint
 import info.nightscout.interfaces.constraints.PluginConstraints
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
index 8d5ebf2b4d..4b9950f7d6 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt
@@ -9,8 +9,8 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.events.EventNewNotification
 import info.nightscout.core.iob.generateCOBString
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt
index dd612b3882..e8274f5ce1 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/general/smsCommunicator/otp/OneTimePassword.kt
@@ -1,9 +1,9 @@
 package info.nightscout.plugins.general.smsCommunicator.otp
 
 import android.util.Base64
+import app.aaps.annotations.OpenForTesting
 import com.eatthepath.otp.HmacOneTimePasswordGenerator
 import com.google.common.io.BaseEncoding
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.Constants
 import info.nightscout.plugins.R
 import info.nightscout.shared.interfaces.ResourceHelper
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index ac0dad3e24..ed678cb298 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.iob.iobCobCalculator
 
 import androidx.collection.LongSparseArray
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.extensions.convertedToAbsolute
 import info.nightscout.core.extensions.iobCalc
 import info.nightscout.core.extensions.toTemporaryBasal
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt
index 0e04a6f7d6..b5472095ff 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/iob/iobCobCalculator/data/AutosensDataStoreObject.kt
@@ -2,7 +2,7 @@ package info.nightscout.plugins.iob.iobCobCalculator.data
 
 import androidx.collection.LongSparseArray
 import androidx.collection.size
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.aps.AutosensData
 import info.nightscout.interfaces.aps.AutosensDataStore
diff --git a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
index 4b2e7e8b3f..cb799090f5 100644
--- a/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
+++ b/plugins/main/src/main/java/info/nightscout/plugins/profile/ProfilePlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.plugins.profile
 
 import androidx.fragment.app.FragmentActivity
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.extensions.blockFromJsonArray
 import info.nightscout.core.extensions.pureProfileFromJson
 import info.nightscout.core.profile.ProfileSealed
diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt
index cade8c08a2..d1bd068caf 100644
--- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt
+++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityAAPSPlugin.kt
@@ -1,7 +1,7 @@
 package info.nightscout.sensitivity
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.core.utils.Percentile
 import info.nightscout.database.entities.TherapyEvent
diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt
index d77c1de943..239ad6bc0b 100644
--- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt
+++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityOref1Plugin.kt
@@ -1,7 +1,7 @@
 package info.nightscout.sensitivity
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.core.utils.Percentile
 import info.nightscout.database.entities.TherapyEvent
diff --git a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt
index 140335f6e5..5920852275 100644
--- a/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt
+++ b/plugins/sensitivity/src/main/java/info/nightscout/sensitivity/SensitivityWeightedAveragePlugin.kt
@@ -1,8 +1,8 @@
 package info.nightscout.sensitivity
 
 import androidx.collection.LongSparseArray
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.MidnightUtils
 import info.nightscout.database.entities.TherapyEvent
 import info.nightscout.database.impl.AppRepository
diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt
index 3894ac7593..ba85f3a022 100644
--- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt
+++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/AvgSmoothingPlugin.kt
@@ -1,7 +1,7 @@
 package info.nightscout.smoothing
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.plugin.PluginBase
diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt
index 22f76d60b0..cc6e364059 100644
--- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt
+++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/ExponentialSmoothingPlugin.kt
@@ -1,7 +1,7 @@
 package info.nightscout.smoothing
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.plugin.PluginBase
diff --git a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt b/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt
index 3ce54bd6c7..1bc4bd92e9 100644
--- a/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt
+++ b/plugins/smoothing/src/main/java/info/nightscout/smoothing/NoSmoothingPlugin.kt
@@ -1,7 +1,7 @@
 package info.nightscout.smoothing
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.iob.InMemoryGlucoseValue
 import info.nightscout.interfaces.plugin.PluginBase
 import info.nightscout.interfaces.plugin.PluginDescription
diff --git a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
index 2e54005571..1942c82d0c 100644
--- a/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
+++ b/plugins/source/src/main/java/info/nightscout/source/GlimpPlugin.kt
@@ -3,8 +3,8 @@ package info.nightscout.source
 import android.content.Context
 import androidx.work.WorkerParameters
 import androidx.work.workDataOf
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.database.entities.GlucoseValue
 import info.nightscout.database.impl.AppRepository
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt
index 025c31660a..482a2e9461 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsShared/NsIncomingDataProcessor.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsShared
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.Food
 import info.nightscout.database.entities.GlucoseValue
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
index b1c15595e3..8910ac2c3b 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/ReceiverDelegate.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.receivers.ReceiverStatusStore
 import info.nightscout.plugins.sync.R
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt
index c7f33f663c..7b9b13a95a 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSDeviceStatusHandler.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclient.data
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.HtmlHelper
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.interfaces.Config
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt
index 200cd69154..466f8fb381 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclient/data/NSSettingsStatusImpl.kt
@@ -3,7 +3,7 @@
 package info.nightscout.plugins.sync.nsclient.data
 
 import android.content.Context
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.ui.dialogs.OKDialog
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.entities.UserEntry
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt
index 4e5ad23df1..fdbc96ad92 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/DataSyncSelectorV3.kt
@@ -1,6 +1,6 @@
 package info.nightscout.plugins.sync.nsclientV3
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.JsonHelper
 import info.nightscout.database.impl.AppRepository
 import info.nightscout.interfaces.Config
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
index bf0b62f41c..9841be8ab7 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/NSClientV3Plugin.kt
@@ -11,10 +11,10 @@ import androidx.work.ExistingWorkPolicy
 import androidx.work.OneTimeWorkRequest
 import androidx.work.WorkInfo
 import androidx.work.WorkManager
+import app.aaps.annotations.OpenForTesting
 import com.google.gson.Gson
 import com.google.gson.GsonBuilder
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.database.ValueWrapper
 import info.nightscout.database.entities.interfaces.TraceableDBEntry
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
index f19054c336..d897e7344e 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/nsclientV3/workers/DataSyncWorker.kt
@@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.nsclientV3.workers
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.sync.nsclientV3.DataSyncSelectorV3
diff --git a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
index f55c5236e0..02bd4afcec 100644
--- a/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
+++ b/plugins/sync/src/main/java/info/nightscout/plugins/sync/xdrip/workers/XdripDataSyncWorker.kt
@@ -2,7 +2,7 @@ package info.nightscout.plugins.sync.xdrip.workers
 
 import android.content.Context
 import androidx.work.WorkerParameters
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.core.utils.worker.LoggingWorker
 import info.nightscout.interfaces.plugin.ActivePlugin
 import info.nightscout.plugins.sync.xdrip.DataSyncSelectorXdripImpl
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
index c7dd9fd764..9ea58cb177 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRKorean/DanaRKoreanPlugin.kt
@@ -5,11 +5,11 @@ import android.content.Context
 import android.content.Intent
 import android.content.ServiceConnection
 import android.os.IBinder
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danaRKorean.services.DanaRKoreanExecutionService
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin
 import info.nightscout.androidaps.danar.R
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.core.constraints.ConstraintObject
 import info.nightscout.core.utils.fabric.FabricPrivacy
 import info.nightscout.interfaces.constraints.ConstraintsChecker
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
index aa68441d5e..52a9dc6a47 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danaRv2/DanaRv2Plugin.java
@@ -11,11 +11,11 @@ import androidx.annotation.NonNull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import app.aaps.annotations.OpenForTesting;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danaRv2.services.DanaRv2ExecutionService;
 import info.nightscout.androidaps.danar.AbstractDanaRPlugin;
 import info.nightscout.androidaps.danar.R;
-import info.nightscout.annotations.OpenForTesting;
 import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.interfaces.constraints.ConstraintsChecker;
diff --git a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
index b240120c0a..08c7f3ef72 100644
--- a/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
+++ b/pump/danar/src/main/java/info/nightscout/androidaps/danar/DanaRPlugin.java
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import app.aaps.annotations.OpenForTesting;
 import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.danar.services.DanaRExecutionService;
-import info.nightscout.annotations.OpenForTesting;
 import info.nightscout.core.constraints.ConstraintObject;
 import info.nightscout.core.utils.fabric.FabricPrivacy;
 import info.nightscout.interfaces.constraints.ConstraintsChecker;
diff --git a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
index eba1e2bab7..4161e34e41 100644
--- a/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
+++ b/pump/medtronic/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.medtronic.driver
 
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.androidaps.plugins.pump.common.events.EventRileyLinkDeviceStatusChange
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem
@@ -8,7 +9,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.BasalProfileStatus
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.BatteryType
 import info.nightscout.androidaps.plugins.pump.medtronic.defs.MedtronicDeviceType
 import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicConst
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.pump.defs.PumpType
 import info.nightscout.pump.common.data.PumpStatus
 import info.nightscout.pump.common.defs.PumpDeviceState
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt
index f894d3360c..c7a268b8fc 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/RandomByteGenerator.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import java.security.SecureRandom
 
 @OpenForTesting
diff --git a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt
index e891a50028..cbc7742108 100644
--- a/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt
+++ b/pump/omnipod-dash/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dash/driver/pod/util/X25519KeyGenerator.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.dash.driver.pod.util
 
+import app.aaps.annotations.OpenForTesting
 import com.google.crypto.tink.subtle.X25519
-import info.nightscout.annotations.OpenForTesting
 
 @OpenForTesting
 class X25519KeyGenerator {
diff --git a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt
index fc3c0e0216..a5868066bf 100644
--- a/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt
+++ b/pump/pump-common/src/main/java/info/nightscout/pump/common/sync/PumpSyncStorage.kt
@@ -1,13 +1,12 @@
 package info.nightscout.pump.common.sync
 
+import app.aaps.annotations.OpenForTesting
 import com.thoughtworks.xstream.XStream
 import com.thoughtworks.xstream.security.AnyTypePermission
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.PumpSync
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
-
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt
index c8eef42754..d3b10a7783 100644
--- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt
+++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/rx/bus/RxBusImpl.kt
@@ -1,6 +1,6 @@
 package app.aaps.shared.impl.rx.bus
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.rx.AapsSchedulers
 import info.nightscout.rx.bus.RxBus
 import info.nightscout.rx.events.Event
diff --git a/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt b/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt
index b1c4fc90a7..e686c87b70 100644
--- a/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt
+++ b/shared/impl/src/main/kotlin/app/aaps/shared/impl/utils/DateUtilImpl.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.collection.LongSparseArray
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.interfaces.R
 import info.nightscout.shared.SafeParse
 import info.nightscout.shared.interfaces.ResourceHelper
diff --git a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt
index 5f491ad8a9..b6dad5253d 100644
--- a/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt
+++ b/shared/tests/src/main/kotlin/app/aaps/shared/tests/TestPumpPlugin.kt
@@ -1,7 +1,7 @@
 package app.aaps.shared.tests
 
+import app.aaps.annotations.OpenForTesting
 import dagger.android.HasAndroidInjector
-import info.nightscout.annotations.OpenForTesting
 import info.nightscout.interfaces.profile.Profile
 import info.nightscout.interfaces.pump.DetailedBolusInfo
 import info.nightscout.interfaces.pump.Pump
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.kt
index ddb2711bac..11bbe97292 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/Persistence.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.interaction.utils
 
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
 import info.nightscout.rx.weardata.EventData
diff --git a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.kt b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.kt
index 80885f87bf..15f3913a3f 100644
--- a/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.kt
+++ b/wear/src/main/java/info/nightscout/androidaps/interaction/utils/WearUtil.kt
@@ -2,12 +2,12 @@ package info.nightscout.androidaps.interaction.utils
 
 import android.content.Context
 import android.os.PowerManager
-import info.nightscout.annotations.OpenForTesting
+import app.aaps.annotations.OpenForTesting
 import info.nightscout.rx.logging.AAPSLogger
 import info.nightscout.rx.logging.LTag
+import kotlinx.datetime.Clock
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlinx.datetime.Clock
 
 /**
  * Created by andy on 3/5/19.