diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.java
index 964326f54a..1f3ea08166 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/AutomationPlugin.java
@@ -219,14 +219,16 @@ public class AutomationPlugin extends PluginBase {
         storeToSP(); // save last run time
     }
 
-    public static final List<Action> actionDummyObjects = new ArrayList<Action>() {{
-        //add(new ActionLoopDisable());
-        //add(new ActionLoopEnable());
-        //add(new ActionLoopResume());
-        //add(new ActionLoopSuspend());
-        add(new ActionStartTempTarget());
-        add(new ActionStopTempTarget());
-        add(new ActionNotification());
-        add(new ActionProfileSwitchPercent());
-    }};
+    public final List<Action> getActionDummyObjects() {
+        return new ArrayList<Action>() {{
+            //add(new ActionLoopDisable());
+            //add(new ActionLoopEnable());
+            //add(new ActionLoopResume());
+            //add(new ActionLoopSuspend());
+            add(new ActionStartTempTarget());
+            add(new ActionStopTempTarget());
+            add(new ActionNotification());
+            add(new ActionProfileSwitchPercent());
+        }};
+    }
 }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java
index ae1e19d561..d84761ab8e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/ChooseActionDialog.java
@@ -37,7 +37,7 @@ public class ChooseActionDialog extends DialogFragment {
         View view = inflater.inflate(R.layout.automation_dialog_choose_action, container, false);
         mUnbinder = ButterKnife.bind(this, view);
 
-        for (Action a : AutomationPlugin.actionDummyObjects) {
+        for (Action a : AutomationPlugin.getPlugin().getActionDummyObjects()) {
             RadioButton radioButton = new RadioButton(getContext());
             radioButton.setText(a.friendlyName());
             radioButton.setTag(a);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java
index 77c72a640d..7a082f3c02 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/TriggerListAdapter.java
@@ -161,7 +161,7 @@ public class TriggerListAdapter {
         build(fragmentManager);
     }
 
-    private void changeConnector(final FragmentManager fragmentManager, final Trigger trigger, final TriggerConnector connector, final TriggerConnector.Type newConnectorType) {
+    public static void changeConnector(final FragmentManager fragmentManager, final Trigger trigger, final TriggerConnector connector, final TriggerConnector.Type newConnectorType) {
         if (connector.size() > 2) {
             // split connector
             int pos = connector.pos(trigger) - 1;
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java
index 403eaaa691..730cb5dc22 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/ComposeTriggerTest.java
@@ -7,6 +7,7 @@ import org.junit.runner.RunWith;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import info.nightscout.androidaps.plugins.general.automation.dialogs.TriggerListAdapter;
 import info.nightscout.androidaps.plugins.general.automation.triggers.DummyTrigger;
 import info.nightscout.androidaps.plugins.general.automation.triggers.Trigger;
 import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerConnector;
@@ -44,7 +45,7 @@ public class ComposeTriggerTest {
         // initialize scenario
         TriggerConnector root = new TriggerConnector(TriggerConnector.Type.AND);
         Trigger t[] = new Trigger[4];
-        for(int i = 0; i < t.length; ++i) {
+        for (int i = 0; i < t.length; ++i) {
             t[i] = new DummyTrigger();
             root.add(t[i]);
         }
@@ -52,7 +53,7 @@ public class ComposeTriggerTest {
 
         // change connector of t1,t2 from "and" to "or"
         Assert.assertEquals(root, t[2].getConnector());
-        AutomationFragment.changeConnector(null, t[2], t[2].getConnector(), TriggerConnector.Type.OR);
+        TriggerListAdapter.changeConnector(null, t[2], t[2].getConnector(), TriggerConnector.Type.OR);
 
         Assert.assertEquals(3, root.size());
         Assert.assertEquals(t[0], root.get(0));
@@ -66,9 +67,9 @@ public class ComposeTriggerTest {
 
         // undo
         Assert.assertEquals(newConnector, t[2].getConnector());
-        AutomationFragment.changeConnector(null, t[2], t[2].getConnector(), TriggerConnector.Type.AND);
+        TriggerListAdapter.changeConnector(null, t[2], t[2].getConnector(), TriggerConnector.Type.AND);
         Assert.assertEquals(4, root.size());
-        for(int i = 0; i < 4; ++i) {
+        for (int i = 0; i < 4; ++i) {
             Assert.assertEquals(t[i], root.get(i));
         }
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java
index cec4991dc1..73b06ad70a 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/general/automation/elements/InputPercentTest.java
@@ -18,7 +18,7 @@ public class InputPercentTest {
         t.textWatcher.beforeTextChanged(null, 0, 0, 0);
         t.textWatcher.onTextChanged(null, 0, 0, 0);
         t.textWatcher.afterTextChanged(null);
-        Assert.assertEquals(500d, t.getValue(), 0.01d);
+        Assert.assertEquals(130d, t.getValue(), 0.01d);
     }
 
     @Test