diff --git a/gateway/platformio.ini b/gateway/platformio.ini
index c8c78f0..75e972a 100644
--- a/gateway/platformio.ini
+++ b/gateway/platformio.ini
@@ -32,7 +32,7 @@ check_severity = medium, high
 
 [env:native]
 platform = native
-test_filter = test_native
+test_filter = native/*
 lib_extra_dirs =
     ../libraries
 lib_deps = 
@@ -59,4 +59,4 @@ test_testing_command =
     -f
     16000000L
     ${platformio.build_dir}/${this.__env__}/firmware.elf
-test_filter = test_embedded
+test_filter = embedded/*
diff --git a/gateway/src/gateway.cpp b/gateway/src/gateway.cpp
index fafb287..a8936d7 100644
--- a/gateway/src/gateway.cpp
+++ b/gateway/src/gateway.cpp
@@ -10,7 +10,7 @@
 #define RECEIVE_PIN 2
 
 
-RCSwitch mySwitch = RCSwitch();
+RCSwitch mySwitch;
 SerialReader<200> serialReader;
 
 void setup() {
diff --git a/gateway/test/embedded/test_dummy/dummy.cpp b/gateway/test/embedded/test_dummy/dummy.cpp
new file mode 100644
index 0000000..352dc1e
--- /dev/null
+++ b/gateway/test/embedded/test_dummy/dummy.cpp
@@ -0,0 +1,18 @@
+#include <Arduino.h>
+#include <unity.h>
+
+void setUp(void) {
+    // set stuff up here
+}
+
+void tearDown(void) {
+    // clean stuff up here
+}
+
+void setup() {
+    UNITY_BEGIN();
+    UNITY_END();
+}
+
+void loop() {
+}
diff --git a/gateway/test/test_native/decoder.cpp b/gateway/test/native/test_decoder/decoder.cpp
similarity index 100%
rename from gateway/test/test_native/decoder.cpp
rename to gateway/test/native/test_decoder/decoder.cpp
diff --git a/gateway/test/test_embedded/sensor_builder.cpp b/gateway/test/native/test_sensor_builder/sensor_builder.cpp
similarity index 98%
rename from gateway/test/test_embedded/sensor_builder.cpp
rename to gateway/test/native/test_sensor_builder/sensor_builder.cpp
index 8ca3ca3..db130f0 100644
--- a/gateway/test/test_embedded/sensor_builder.cpp
+++ b/gateway/test/native/test_sensor_builder/sensor_builder.cpp
@@ -1,4 +1,3 @@
-#include <Arduino.h>
 #include <unity.h>
 #include "TinyComponent.h"
 
@@ -98,7 +97,7 @@ void test_oil_sensor_with_voltage(void) {
     TEST_ASSERT_EQUAL(2.847, diagnostic["voltage"]);
 }
 
-void setup() {
+int main(int argc, char **argv) {
     UNITY_BEGIN();
     RUN_TEST(test_unknown_sensor_type);
     RUN_TEST(test_max_temp);
@@ -110,7 +109,6 @@ void setup() {
     RUN_TEST(test_oil_sensor);
     RUN_TEST(test_oil_sensor_with_voltage);
     UNITY_END();
-}
 
-void loop() {
+    return 0;
 }