From c283531348a5407d11c68b060ee41990453b5e2e Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Wed, 18 Mar 2020 23:09:51 +0100
Subject: [PATCH] Dana messages tests

---
 .../plugins/pump/danaR/comm/MessageBase.java  |  2 +-
 .../pump/danaR/comm/MsgInitConnStatusBolus.kt |  1 +
 .../danaR/comm/MsgInitConnStatusOption.kt     |  1 +
 .../comm/MsgSetAPSTempBasalStart_v2.kt        |  4 +-
 .../comm/MsgInitConnStatusBasicTest.java      | 54 ------------
 .../danaR/comm/MsgInitConnStatusBasicTest.kt  | 21 +++++
 .../comm/MsgInitConnStatusBolusTest.java      | 57 -------------
 .../danaR/comm/MsgInitConnStatusBolusTest.kt  | 30 +++++++
 .../comm/MsgInitConnStatusOptionTest.java     | 59 -------------
 .../danaR/comm/MsgInitConnStatusOptionTest.kt | 34 ++++++++
 .../danaR/comm/MsgInitConnStatusTimeTest.java | 62 --------------
 .../danaR/comm/MsgInitConnStatusTimeTest.kt   | 36 ++++++++
 .../pump/danaR/comm/MsgPCCommStartTest.java   | 40 ---------
 .../pump/danaR/comm/MsgPCCommStartTest.kt     | 16 ++++
 .../pump/danaR/comm/MsgPCCommStopTest.java    | 40 ---------
 .../pump/danaR/comm/MsgPCCommStopTest.kt      | 17 ++++
 .../comm/MsgSetActivateBasalProfileTest.java  | 43 ----------
 .../comm/MsgSetActivateBasalProfileTest.kt    | 18 ++++
 .../danaR/comm/MsgSetBasalProfileTest.java    | 52 ------------
 .../pump/danaR/comm/MsgSetBasalProfileTest.kt | 23 ++++++
 .../pump/danaR/comm/MsgSetCarbsEntryTest.java | 43 ----------
 .../pump/danaR/comm/MsgSetCarbsEntryTest.kt   | 18 ++++
 .../comm/MsgSetExtendedBolusStartTest.java    | 44 ----------
 .../comm/MsgSetExtendedBolusStartTest.kt      | 28 +++++++
 .../comm/MsgSetExtendedBolusStopTest.java     | 43 ----------
 .../danaR/comm/MsgSetExtendedBolusStopTest.kt | 18 ++++
 .../comm/MsgSetSingleBasalProfileTest.java    | 51 ------------
 .../comm/MsgSetSingleBasalProfileTest.kt      | 23 ++++++
 .../danaR/comm/MsgSetTempBasalStartTest.java  | 43 ----------
 .../danaR/comm/MsgSetTempBasalStartTest.kt    | 18 ++++
 .../danaR/comm/MsgSetTempBasalStopTest.java   | 43 ----------
 .../pump/danaR/comm/MsgSetTimeTest.java       | 45 ----------
 .../plugins/pump/danaR/comm/MsgSetTimeTest.kt | 19 +++++
 .../danaR/comm/MsgSetUserOptionsTest.java     | 42 ----------
 .../pump/danaR/comm/MsgSetUserOptionsTest.kt  | 17 ++++
 .../comm/MsgSettingActiveProfileTest.java     | 45 ----------
 .../danaR/comm/MsgSettingActiveProfileTest.kt | 18 ++++
 .../comm/MsgSettingBasalProfileAllTest.java   | 40 ---------
 .../comm/MsgSettingBasalProfileAllTest.kt     | 16 ++++
 .../pump/danaR/comm/MsgSettingBasalTest.java  | 46 -----------
 .../pump/danaR/comm/MsgSettingBasalTest.kt    | 28 +++++++
 .../danaR/comm/MsgSettingGlucoseTest.java     | 45 ----------
 .../pump/danaR/comm/MsgSettingGlucoseTest.kt  | 18 ++++
 .../danaR/comm/MsgSettingMaxValuesTest.java   | 45 ----------
 .../danaR/comm/MsgSettingMaxValuesTest.kt     | 18 ++++
 .../pump/danaR/comm/MsgSettingMealTest.java   | 45 ----------
 .../pump/danaR/comm/MsgSettingMealTest.kt     | 29 +++++++
 .../comm/MsgSettingProfileRatiosAllTest.java  | 46 -----------
 .../comm/MsgSettingProfileRatiosAllTest.kt    | 20 +++++
 .../comm/MsgSettingProfileRatiosTest.java     | 46 -----------
 .../danaR/comm/MsgSettingProfileRatiosTest.kt | 19 +++++
 .../danaR/comm/MsgSettingPumpTimeTest.java    | 58 -------------
 .../pump/danaR/comm/MsgSettingPumpTimeTest.kt | 29 +++++++
 .../comm/MsgSettingShippingInfoTest.java      | 46 -----------
 .../danaR/comm/MsgSettingShippingInfoTest.kt  | 19 +++++
 .../danaR/comm/MsgSettingUserOptionsTest.java | 46 -----------
 .../danaR/comm/MsgSettingUserOptionsTest.kt   | 20 +++++
 .../pump/danaR/comm/MsgStatusBasicTest.java   | 44 ----------
 .../pump/danaR/comm/MsgStatusBasicTest.kt     | 17 ++++
 .../comm/MsgStatusBolusExtendedTest.java      | 53 ------------
 .../danaR/comm/MsgStatusBolusExtendedTest.kt  | 28 +++++++
 .../pump/danaR/comm/MsgStatusProfileTest.java | 46 -----------
 .../pump/danaR/comm/MsgStatusProfileTest.kt   | 19 +++++
 .../danaR/comm/MsgStatusTempBasalTest.java    | 35 --------
 .../pump/danaR/comm/MsgStatusTempBasalTest.kt | 29 +++++++
 .../pump/danaR/comm/MsgStatusTest.java        | 44 ----------
 .../plugins/pump/danaR/comm/MsgStatusTest.kt  | 17 ++++
 .../comm/MsgSetAPSTempBasalStart_v2Test.java  | 82 -------------------
 .../comm/MsgSetAPSTempBasalStart_v2Test.kt    | 51 ++++++++++++
 .../comm/MsgSetHistoryEntry_v2Test.java       | 62 --------------
 .../danaRv2/comm/MsgSetHistoryEntry_v2Test.kt | 22 +++++
 .../danaRv2/comm/MsgStatusAPS_v2Test.java     | 57 -------------
 .../pump/danaRv2/comm/MsgStatusAPS_v2Test.kt  | 23 ++++++
 .../comm/MsgStatusBolusExtended_v2Test.java   | 56 -------------
 .../comm/MsgStatusBolusExtended_v2Test.kt     | 20 +++++
 .../comm/MsgStatusTempBasal_v2Test.java       | 63 --------------
 .../danaRv2/comm/MsgStatusTempBasal_v2Test.kt | 21 +++++
 77 files changed, 822 insertions(+), 1814 deletions(-)
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
 delete mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
 create mode 100644 app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
index a189958d4a..f52d62d9c2 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageBase.java
@@ -24,7 +24,7 @@ import info.nightscout.androidaps.utils.CRC;
 
 public class MessageBase {
     private static Logger log = StacktraceLoggerWrapper.getLogger(L.PUMPCOMM);
-    protected byte[] buffer = new byte[512];
+    public byte[] buffer = new byte[512];
     private int position = 6;
 
     public boolean received = false;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
index a6c302b9e9..580df8e133 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolus.kt
@@ -27,6 +27,7 @@ class MsgInitConnStatusBolus(
             failed = true
             return
         }
+        failed = false
         val bolusConfig = intFromBuff(bytes, 0, 1)
         danaRPump.isExtendedBolusEnabled = bolusConfig and 0x01 != 0
         danaRPump.bolusStep = intFromBuff(bytes, 1, 1) / 100.0
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
index e2a7f62bbc..ee1d26ce3f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOption.kt
@@ -35,6 +35,7 @@ class MsgInitConnStatusOption(
         //val lowReservoirAlarmBoundary = intFromBuff(bytes, 7, 1)
         //int none = intFromBuff(bytes, 8, 1);
         if (bytes.size >= 21) {
+            failed = false
             danaRPump.password = intFromBuff(bytes, 9, 2) xor 0x3463
             aapsLogger.debug(LTag.PUMPCOMM, "Pump password: " + danaRPump.password)
         } else {
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
index 46e38a3dae..95d2b56b77 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -11,8 +11,8 @@ class MsgSetAPSTempBasalStart_v2(
     thirtyMinutes: Boolean
 ) : MessageBase() {
 
-    private val PARAM30MIN = 160
-    private val PARAM15MIN = 150
+    val PARAM30MIN = 160
+    val PARAM15MIN = 150
 
     init {
         SetCommand(0xE002)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
deleted file mode 100644
index 959d114098..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgInitConnStatusBasicTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-       MsgInitConnStatusBasic packet = new MsgInitConnStatusBasic();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(true, pump.pumpSuspended);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
new file mode 100644
index 0000000000..eba32dbf35
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgInitConnStatusBasicTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgInitConnStatusBasic(aapsLogger, danaRPump)
+
+        // test message decoding
+        val array = ByteArray(100)
+
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRPump.pumpSuspended)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
deleted file mode 100644
index f7860fbaa2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgInitConnStatusBolusTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgInitConnStatusBolus packet = new MsgInitConnStatusBolus();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        // message bigger than 22
-        assertEquals(true, packet.failed);
-        packet.handleMessage(createArray(20, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(true, pump.isExtendedBolusEnabled);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
new file mode 100644
index 0000000000..28039329a7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgInitConnStatusBolusTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        val packet = MsgInitConnStatusBolus(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump)
+
+        // test message decoding
+        var array = ByteArray(100)
+
+        // message bigger than 22
+        packet.handleMessage(array)
+        Assert.assertEquals(true, packet.failed)
+        array = ByteArray(20)
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRPump.isExtendedBolusEnabled)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
deleted file mode 100644
index 0b1d956ded..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, ConfigBuilderPlugin.class})
-public class MsgInitConnStatusOptionTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConfigBuilder();
-        MsgInitConnStatusOption packet = new MsgInitConnStatusOption();
-
-        // test message decoding
-        packet.handleMessage(createArray(20, (byte) 1));
-        // message smaller than 21
-        assertEquals(true, packet.failed);
-        packet.handleMessage(createArray(22, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(false, pump.isPasswordOK());
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
new file mode 100644
index 0000000000..3b2f7b9045
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.api.mockito.PowerMockito
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(VirtualPumpPlugin::class)
+class MsgInitConnStatusOptionTest : DanaRTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        `when`(activePlugin.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
+        val packet = MsgInitConnStatusOption(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, activePlugin)
+
+        // test message decoding
+        packet.handleMessage(createArray(20, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // message smaller than 21
+        packet.handleMessage(createArray(22, 1.toByte()))
+        Assert.assertEquals(false, danaRPump.isPasswordOK)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
deleted file mode 100644
index b5ef46e9b2..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class, ConfigBuilderPlugin.class})
-public class MsgInitConnStatusTimeTest {
-    @Test
-    public void runTest() {
-        MsgInitConnStatusTime packet = new MsgInitConnStatusTime();
-
-        // test message decoding
-        packet.handleMessage(createArray(20, (byte) 1));
-        // message smaller than 10
-        assertEquals(false, packet.failed);
-        packet.handleMessage(createArray(15, (byte) 1));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConfigBuilder();
-        AAPSMocker.mockCommandQueue();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
new file mode 100644
index 0000000000..cfb55eaae7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class)
+class MsgInitConnStatusTimeTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
+    @Mock lateinit var commandQueue: CommandQueueProvider
+
+    @Test fun runTest() {
+        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue)
+
+        // test message decoding
+        packet.handleMessage(createArray(20, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+        // message smaller than 10
+        packet.handleMessage(createArray(15, 1.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
deleted file mode 100644
index ada4d9a1fb..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgPCCommStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgPCCommStart packet = new MsgPCCommStart();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
new file mode 100644
index 0000000000..8a4856ffab
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgPCCommStartTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgPCCommStart(aapsLogger)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
deleted file mode 100644
index 81b9c32aa1..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgPCCommStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgPCCommStop packet = new MsgPCCommStop();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
new file mode 100644
index 0000000000..89b3c6a334
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgPCCommStopTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgPCCommStop(aapsLogger)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
deleted file mode 100644
index ca87435a7a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetActivateBasalProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetActivateBasalProfile packet = new MsgSetActivateBasalProfile((byte) 1);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
new file mode 100644
index 0000000000..47875c29a7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetActivateBasalProfileTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetActivateBasalProfile(aapsLogger, 1.toByte())
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
deleted file mode 100644
index ed4fb83a10..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetBasalProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetBasalProfile packet = new MsgSetBasalProfile((byte) 1, createArray(24,1));
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
new file mode 100644
index 0000000000..9f6dbeb07e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetBasalProfileTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        val packet = MsgSetBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper, 1.toByte(), Array(24) { 1.0 })
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
deleted file mode 100644
index 72cbb54516..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetCarbsEntryTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetCarbsEntry packet = new MsgSetCarbsEntry(System.currentTimeMillis(), 10);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
new file mode 100644
index 0000000000..2de9486752
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetCarbsEntryTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), 10)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
deleted file mode 100644
index 87ace6198a..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetExtendedBolusStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        AAPSMocker.mockConstraintsChecker();
-        MsgSetExtendedBolusStart packet = new MsgSetExtendedBolusStart(2D, (byte) 2);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
new file mode 100644
index 0000000000..8971cee5f3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.Constraint
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(ConstraintChecker::class)
+class MsgSetExtendedBolusStartTest : DanaRTestBase() {
+
+    @Mock lateinit var constraintChecker: ConstraintChecker
+
+    @Test fun runTest() {
+        `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
+        val packet = MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 2.0, 2.toByte())
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
deleted file mode 100644
index 21391e47b4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetExtendedBolusStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetExtendedBolusStop packet = new MsgSetExtendedBolusStop();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
new file mode 100644
index 0000000000..5ed8ed4dcb
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetExtendedBolusStopTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetExtendedBolusStop(aapsLogger)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
deleted file mode 100644
index cfb17d9ab5..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetSingleBasalProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetSingleBasalProfile packet = new MsgSetSingleBasalProfile(createArray(24, 2));
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
new file mode 100644
index 0000000000..36fdee444e
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetSingleBasalProfileTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+
+    @Test fun runTest() {
+        val packet = MsgSetSingleBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper,  createArray(24, 2.0))
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
deleted file mode 100644
index e6b6123805..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetTempBasalStartTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetTempBasalStart packet = new MsgSetTempBasalStart(250, 1);
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
new file mode 100644
index 0000000000..cee42aea82
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetTempBasalStartTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetTempBasalStart(aapsLogger, 250, 1)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
deleted file mode 100644
index 1bd0ea8299..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStopTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetTempBasalStopTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetTempBasalStop packet = new MsgSetTempBasalStop();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
deleted file mode 100644
index 0214cf58f9..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetTimeTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetTime packet = new MsgSetTime(new Date(System.currentTimeMillis()));
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
new file mode 100644
index 0000000000..067d368591
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class MsgSetTimeTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetTime(aapsLogger, Date(System.currentTimeMillis()))
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
deleted file mode 100644
index 71447a258b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetUserOptionsTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSetUserOptions packet = new MsgSetUserOptions();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        assertEquals(true, packet.failed);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
new file mode 100644
index 0000000000..d151b539c0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetUserOptionsTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSetUserOptions(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(true, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
deleted file mode 100644
index 3d523ebf6c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingActiveProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingActiveProfile packet = new MsgSettingActiveProfile();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(MessageBase.intFromBuff(createArray(34, (byte) 7), 0, 1), pump.activeProfile);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
new file mode 100644
index 0000000000..3af752abe9
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingActiveProfileTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingActiveProfile(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaRPump.activeProfile)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
deleted file mode 100644
index b1877a5611..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingBasalProfileAllTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingBasalProfileAll packet = new MsgSettingBasalProfileAll();
-
-        // test message decoding
-        packet.handleMessage(createArray(400, (byte) 1));
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
new file mode 100644
index 0000000000..2d38ce7bd7
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -0,0 +1,16 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingBasalProfileAllTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingBasalProfileAll(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(400, 1.toByte()))
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
deleted file mode 100644
index 7d1583a73b..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingBasalTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingBasal packet = new MsgSettingBasal();
-
-        // test message decoding
-        packet.handleMessage(createArray(100, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        int expected = MessageBase.intFromBuff(createArray(100, (byte) 1), 2 * 1, 2);
-        assertEquals((double) expected/100d, pump.pumpProfiles[pump.activeProfile][1], 0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
new file mode 100644
index 0000000000..158a364a6d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRPlugin::class)
+class MsgSettingBasalTest : DanaRTestBase() {
+
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+
+    @Test fun runTest() {
+        `when`(danaRPlugin.getPumpDescription()).thenReturn(PumpDescription())
+        val packet = MsgSettingBasal(aapsLogger, danaRPump, danaRPlugin)
+
+        // test message decoding
+        packet.handleMessage(createArray(100, 1.toByte()))
+        val expected = MessageBase.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
+        Assert.assertEquals(expected.toDouble() / 100.0, danaRPump.pumpProfiles!![danaRPump.activeProfile][1], 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
deleted file mode 100644
index c0428a886e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingGlucoseTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingGlucose packet = new MsgSettingGlucose();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(1, pump.units);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
new file mode 100644
index 0000000000..99da2bbc92
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingGlucoseTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingGlucose(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(1, danaRPump.units)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
deleted file mode 100644
index 8da983b213..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingMaxValuesTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingMaxValues packet = new MsgSettingMaxValues();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2) / 100d, pump.maxBolus,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
new file mode 100644
index 0000000000..07500d1ce5
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -0,0 +1,18 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingMaxValuesTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingMaxValues(aapsLogger, danaRPump)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaRPump.maxBolus, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
deleted file mode 100644
index 2ba1be66a7..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingMealTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingMeal packet = new MsgSettingMeal();
-
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 1), 0, 1) / 100d, pump.bolusStep, 0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
new file mode 100644
index 0000000000..a56270ad09
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin
+import info.nightscout.androidaps.plugins.pump.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.powermock.core.classloader.annotations.PrepareForTest
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+@PrepareForTest(DanaRPlugin::class, DanaRKoreanPlugin::class)
+class MsgSettingMealTest : DanaRTestBase() {
+
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+
+    @Test fun runTest() {
+        val packet = MsgSettingMeal(aapsLogger, RxBusWrapper(), resourceHelper, danaRPump, danaRKoreanPlugin)
+
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaRPump.bolusStep, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
deleted file mode 100644
index d65da6805f..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingProfileRatiosAllTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingProfileRatiosAll packet = new MsgSettingProfileRatiosAll();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2), pump.morningCIR,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
new file mode 100644
index 0000000000..be2f65f3ad
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingProfileRatiosAll(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.morningCIR)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
deleted file mode 100644
index bcb9734c04..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingProfileRatiosTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingProfileRatios packet = new MsgSettingProfileRatios();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2), pump.currentCIR,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
new file mode 100644
index 0000000000..080aef2a8d
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingProfileRatiosTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingProfileRatios(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
deleted file mode 100644
index fa21a2a197..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import java.util.Date;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingPumpTimeTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingPumpTime packet = new MsgSettingPumpTime();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        byte[] bytes = createArray(34, (byte) 7);
-        long time =
-                new Date(
-                        100 + MessageBase.intFromBuff(bytes, 5, 1),
-                        MessageBase.intFromBuff(bytes, 4, 1) - 1,
-                        MessageBase.intFromBuff(bytes, 3, 1),
-                        MessageBase.intFromBuff(bytes, 2, 1),
-                        MessageBase.intFromBuff(bytes, 1, 1),
-                        MessageBase.intFromBuff(bytes, 0, 1)
-                ).getTime();
-        packet.handleMessage(bytes);
-        pump = DanaRPump.getInstance();
-        assertEquals(time, pump.pumpTime);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
new file mode 100644
index 0000000000..7a40b86a07
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import java.util.*
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingPumpTimeTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingPumpTime(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        val bytes = createArray(34, 7.toByte())
+        val time = Date(
+            100 + MessageBase.intFromBuff(bytes, 5, 1),
+            MessageBase.intFromBuff(bytes, 4, 1) - 1,
+            MessageBase.intFromBuff(bytes, 3, 1),
+            MessageBase.intFromBuff(bytes, 2, 1),
+            MessageBase.intFromBuff(bytes, 1, 1),
+            MessageBase.intFromBuff(bytes, 0, 1)
+        ).time
+        packet.handleMessage(bytes)
+        Assert.assertEquals(time, danaRPump.pumpTime)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
deleted file mode 100644
index aa8999ced4..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingShippingInfoTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingShippingInfo packet = new MsgSettingShippingInfo();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals(MessageBase.stringFromBuff(createArray(34, (byte) 7), 0, 10), pump.serialNumber);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
new file mode 100644
index 0000000000..7f9e2ea6c3
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingShippingInfoTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingShippingInfo(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaRPump.serialNumber)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
deleted file mode 100644
index bb60b0da1e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSettingUserOptionsTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgSettingUserOptions packet = new MsgSettingUserOptions();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(48, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((byte) 7 & 255 , pump.lcdOnTimeSec);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
new file mode 100644
index 0000000000..f18dde576b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+import kotlin.experimental.and
+
+@RunWith(PowerMockRunner::class)
+class MsgSettingUserOptionsTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgSettingUserOptions(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(48, 7.toByte()))
+        Assert.assertEquals(7, danaRPump.lcdOnTimeSec)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
deleted file mode 100644
index 06ac6d5e7c..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusBasicTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatusBasic packet = new MsgStatusBasic();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(34, (byte) 7), 0, 3) / 750d, pump.dailyTotalUnits,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
new file mode 100644
index 0000000000..b627d55c86
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusBasicTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatusBasic(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaRPump.dailyTotalUnits, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
deleted file mode 100644
index dd5751d1b3..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusBolusExtendedTest {
-    @Mock
-    Context context;
-    @Test
-    public void runTest() throws Exception{
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        try {
-            AAPSMocker.mockTreatmentService();
-        } catch (Exception e){
-
-        }
-        MsgStatusBolusExtended packet = new MsgStatusBolusExtended();
-        // test message decoding
-        //TODO Find a way to mock treatments plugin
-//        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-//        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 2, 2)/100d, pump.extendedBolusAmount,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
new file mode 100644
index 0000000000..d2e2336ac2
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusBolusExtendedTest : DanaRTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test
+    fun runTest() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        val packet = MsgStatusBolusExtended(aapsLogger, danaRPump, activePlugin)
+        // test message decoding
+        val array = ByteArray(100)
+        putByteToArray(array, 0, 1)
+        packet.handleMessage(array)
+        Assert.assertEquals(true, danaRPump.isExtendedInProgress)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
deleted file mode 100644
index c91409b237..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusProfileTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatusProfile packet = new MsgStatusProfile();
-        DanaRPump pump = DanaRPump.getInstance();
-        pump.units = DanaRPump.UNITS_MGDL;
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 0, 2), pump.currentCIR,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
new file mode 100644
index 0000000000..4af9c12894
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusProfileTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatusProfile(aapsLogger, danaRPump)
+        danaRPump.units = DanaRPump.UNITS_MGDL
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaRPump.currentCIR)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
deleted file mode 100644
index 4bb51a1a00..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * Created by Rumen Georgiev on 8/31/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusTempBasalTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatusTempBasal packet = new MsgStatusTempBasal();
-        DanaRPump pump = DanaRPump.getInstance();
-        // test message decoding
-        // Calling context.getResources() before super.onCreate() returns nullPointerException
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
new file mode 100644
index 0000000000..703b9b1e3b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import info.nightscout.androidaps.interfaces.ActivePluginProvider
+import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mock
+import org.mockito.Mockito.`when`
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusTempBasalTest : DanaRTestBase() {
+
+    @Mock lateinit var activePlugin: ActivePluginProvider
+    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
+
+    @Test fun runTest() {
+        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
+        val packet = MsgStatusTempBasal(aapsLogger, danaRPump, activePlugin)
+        // test message decoding
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
+        // passing an bigger number
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(false, danaRPump.isTempBasalInProgress)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
deleted file mode 100644
index 7d30e8da09..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaR.comm;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 8/30/2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusTest {
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        MsgStatus packet = new MsgStatus();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(34, (byte) 7), 0, 3) / 750d, pump.dailyTotalUnits,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
new file mode 100644
index 0000000000..8bde4483c0
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.plugins.pump.danaR.comm
+
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusTest : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatus(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaRPump.dailyTotalUnits, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
deleted file mode 100644
index 8835ee341e..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.assertEquals;
-
-/**
- * Created by mike on 20.11.2017.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class})
-public class MsgSetAPSTempBasalStart_v2Test extends MsgSetAPSTempBasalStart_v2 {
-
-    @Test
-    public void runTest() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-
-        // under 100% should last 30 min
-        setParams(0);
-        assertEquals(0, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // over 100% should last 15 min
-        setParams(150);
-        assertEquals(150, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test low hard limit
-        setParams(-1);
-        assertEquals(0, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test high hard limit
-        setParams(550);
-        assertEquals(500, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test setting 15 min
-        setParams(50, true, false);
-        assertEquals(50, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test setting 30 min
-        setParams(50, false, true);
-        assertEquals(50, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // over 200% set always 15 min
-        setParams(250, false, true);
-        assertEquals(250, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test low hard limit
-        setParams(-1, false, true);
-        assertEquals(0, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM30MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-        // test high hard limit
-        setParams(550, false, true);
-        assertEquals(500, intFromBuff(buffer, 0, 2));
-        assertEquals(PARAM15MIN, intFromBuff(buffer, 2, 1));
-        resetBuffer();
-
-        // test message decoding
-        handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0});
-        assertEquals(true, failed);
-        handleMessage(new byte[]{(byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 0, (byte) 1});
-        assertEquals(false, failed);
-    }
-
-}
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
new file mode 100644
index 0000000000..92ea976697
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase.intFromBuff
+import info.nightscout.androidaps.plugins.pump.danaRS.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetAPSTempBasalStart_v2Test : DanaRTestBase() {
+
+    @Test fun runTest() {
+
+        // test low hard limit
+        var packet = MsgSetAPSTempBasalStart_v2(aapsLogger, -1, true, false)
+        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test high hard limit
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 550, true, false)
+        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test setting 15 min
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 50, true, false)
+        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test setting 30 min
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 50, false, true)
+        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        // over 200% set always 15 min
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 250, false, true)
+        Assert.assertEquals(250, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        // test low hard limit
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, -1, false, true)
+        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        // test high hard limit
+        packet = MsgSetAPSTempBasalStart_v2(aapsLogger, 550, false, true)
+        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+
+        // test message decoding
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
deleted file mode 100644
index d554c33e8d..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgSetHistoryEntry_v2Test {
-    @Test
-    public void runTest() {
-
-        MsgSetHistoryEntry_v2 initializerTest = new MsgSetHistoryEntry_v2((byte) 1, System.currentTimeMillis(), 1, 0);
-        MsgSetHistoryEntry_v2 packet = new MsgSetHistoryEntry_v2();
-        // test message decoding
-        // != 1 fails
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(true, packet.failed);
-        // passing an bigger number
-        packet = new MsgSetHistoryEntry_v2();
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(false, packet.failed);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
new file mode 100644
index 0000000000..34b0fc8b7b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgSetHistoryEntry_v2Test : DanaRTestBase() {
+
+    @Test fun runTest() {
+        var packet = MsgSetHistoryEntry_v2(aapsLogger, 1, System.currentTimeMillis(), 1, 0)
+        // test message decoding
+        // != 1 fails
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(true, packet.failed)
+        // passing an bigger number
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(false, packet.failed)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
deleted file mode 100644
index 63e7011603..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.utils.SP;
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusAPS_v2Test {
-    @Mock
-    Context context;
-    @Test
-    public void runTest() throws Exception{
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-
-        try {
-            AAPSMocker.mockTreatmentService();
-        } catch (Exception e){
-
-        }
-        MsgStatusAPS_v2 packet = new MsgStatusAPS_v2();
-        // test iob
-        //TODO Find a way to mock treatments plugin
-        byte[] testArray = createArray(34, (byte) 7);
-        double iob = MessageBase.intFromBuff(testArray, 0, 2) / 100d;
-        packet.handleMessage(testArray);
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals(iob, pump.iob, 0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
new file mode 100644
index 0000000000..c873d4619b
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
@@ -0,0 +1,23 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusAPS_v2Test : DanaRTestBase() {
+
+    @Test
+    fun runTest() {
+        val packet = MsgStatusAPS_v2(aapsLogger, danaRPump)
+        // test iob
+        //TODO Find a way to mock treatments plugin
+        val testArray = createArray(34, 7.toByte())
+        val iob = MessageBase.intFromBuff(testArray, 0, 2) / 100.0
+        packet.handleMessage(testArray)
+        Assert.assertEquals(iob, danaRPump.iob, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
deleted file mode 100644
index 2f12a15240..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-
-/**
- * Created by Rumen Georgiev on 30.10.2018
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusBolusExtended_v2Test {
-    @Mock
-    Context context;
-    @Test
-    public void runTest() throws Exception{
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-        try {
-            AAPSMocker.mockTreatmentService();
-        } catch (Exception e){
-
-        }
-        MsgStatusBolusExtended_v2 packet = new MsgStatusBolusExtended_v2();
-        // test message decoding
-        //TODO Find a way to mock treatments plugin
-        packet.handleMessage(createArray(34, (byte) 7));
-        DanaRPump pump = DanaRPump.getInstance();
-        assertEquals((double) MessageBase.intFromBuff(createArray(10, (byte) 7), 2, 2)/100d, pump.extendedBolusAmount,0);
-
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
new file mode 100644
index 0000000000..2f55887d29
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.plugins.pump.danaR.comm.MessageBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusBolusExtended_v2Test : DanaRTestBase() {
+
+    @Test
+    fun runTest() {
+        val packet = MsgStatusBolusExtended_v2(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 7.toByte()))
+        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaRPump.extendedBolusAmount, 0.0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
deleted file mode 100644
index 8cb45dc5ee..0000000000
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.danaRv2.comm;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import info.AAPSMocker;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPlugin;
-import info.nightscout.androidaps.plugins.pump.danaR.DanaRPump;
-import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin;
-import info.nightscout.androidaps.utils.SP;
-
-import static org.junit.Assert.*;
-/**
- * Created by Rumen Georgiev on 30.10.2018.
- */
-
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
-public class MsgStatusTempBasal_v2Test {
-    @Test
-    public void runTest() {
-        MsgStatusTempBasal_v2 packet = new MsgStatusTempBasal_v2();
-        DanaRPump pump = DanaRPump.getInstance();
-        // test message decoding
-        packet.handleMessage(createArray(34, (byte) 1));
-        assertEquals(true, pump.isTempBasalInProgress);
-        // passing an bigger number
-        packet = new MsgStatusTempBasal_v2();
-
-        packet.handleMessage(createArray(34, (byte) 2));
-        assertEquals(false, pump.isTempBasalInProgress);
-    }
-
-    byte[] createArray(int length, byte fillWith){
-        byte[] ret = new byte[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    double[] createArray(int length, double fillWith){
-        double[] ret = new double[length];
-        for(int i = 0; i<length; i++){
-            ret[i] = fillWith;
-        }
-        return ret;
-    }
-
-    @Before
-    public void mock() {
-        AAPSMocker.mockMainApp();
-        AAPSMocker.mockApplicationContext();
-        AAPSMocker.mockSP();
-        AAPSMocker.mockL();
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
new file mode 100644
index 0000000000..fa98c68830
--- /dev/null
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.plugins.pump.danaRv2.comm
+
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.powermock.modules.junit4.PowerMockRunner
+
+@RunWith(PowerMockRunner::class)
+class MsgStatusTempBasal_v2Test : DanaRTestBase() {
+
+    @Test fun runTest() {
+        val packet = MsgStatusTempBasal_v2(aapsLogger, danaRPump)
+        // test message decoding
+        packet.handleMessage(createArray(34, 1.toByte()))
+        Assert.assertEquals(true, danaRPump.isTempBasalInProgress)
+        // passing an bigger number
+        packet.handleMessage(createArray(34, 2.toByte()))
+        Assert.assertEquals(false, danaRPump.isTempBasalInProgress)
+    }
+}
\ No newline at end of file