diff --git a/sdk-java/src/test/java/ly/count/sdk/java/internal/ModuleEventsTests.java b/sdk-java/src/test/java/ly/count/sdk/java/internal/ModuleEventsTests.java
new file mode 100644
index 000000000..d16e1c10a
--- /dev/null
+++ b/sdk-java/src/test/java/ly/count/sdk/java/internal/ModuleEventsTests.java
@@ -0,0 +1,150 @@
+package ly.count.sdk.java.internal;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import ly.count.sdk.java.Config;
+import ly.count.sdk.java.Countly;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+import org.junit.runners.MethodSorters;
+
+@RunWith(JUnit4.class)
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class ModuleEventsTests {
+
+    private ModuleEvents moduleEvents;
+
+    @BeforeClass
+    public static void init() {
+        if(Countly.isInitialized()) return;
+        // System specific folder structure
+        String[] sdkStorageRootPath = { System.getProperty("user.home"), "__COUNTLY", "java_test" };
+        File sdkStorageRootDirectory = new File(String.join(File.separator, sdkStorageRootPath));
+
+        if (sdkStorageRootDirectory.mkdirs()) {
+            throw new RuntimeException("Directory creation failed");
+        }
+        Config cc = new Config("https://try.count.ly", "COUNTLY_APP_KEY", sdkStorageRootDirectory);
+
+        cc.enableFeatures(Config.Feature.Events).setEventQueueSizeToSend(4);
+        Countly.instance().init(cc);
+    }
+
+    @AfterClass
+    public static void stop() {
+        Countly.stop(false);
+    }
+
+    @Before
+    public void start() {
+        moduleEvents = (ModuleEvents) SDKCore.instance.module(CoreFeature.Events.getIndex());
+    }
+
+    /**
+     * Records an event and checks if it was recorded correctly
+     * by looking into event queue
+     */
+    @Test
+    public void recordEvent() {
+        moduleEvents.eventQueue.clear();
+        Assert.assertEquals(0, moduleEvents.eventQueue.size);
+
+        //create segmentation
+        Map<String, Object> segmentation = new HashMap<>();
+        segmentation.put("name", "Johny");
+        segmentation.put("weight", 67);
+        segmentation.put("bald", true);
+
+        //record event with key segmentation and count
+        Countly.instance().events().recordEvent("test-recordEvent", 1, 45.9, segmentation, 32.0);
+
+        //check if event was recorded correctly and size of event queue is equal to size of events in queue
+        List<EventImpl> events = TestUtils.getCurrentEventQueue(moduleEvents.ctx.getContext(), moduleEvents.L);
+        Assert.assertEquals(1, moduleEvents.eventQueue.size);
+        Assert.assertEquals(1, events.size());
+
+        //check if event was recorded correctly
+        EventImpl event = events.get(0);
+
+        Assert.assertEquals("test-recordEvent", event.key);
+        Assert.assertEquals(1, event.count);
+        Assert.assertEquals(segmentation, event.segmentation);
+        Assert.assertEquals(new Double(45.9), event.sum);
+        Assert.assertEquals(new Double(32.0), event.duration);
+    }
+
+    /**
+     * Records an event with for the next test case
+     */
+    @Test
+    public void recordEvent_fillEventQueue() {
+        try {
+            Assert.assertEquals(1, moduleEvents.eventQueue.size);
+
+            //create segmentation
+            Map<String, Object> segmentation = new HashMap<>();
+            segmentation.put("size", "xl");
+            segmentation.put("height", 184);
+            segmentation.put("married", false);
+
+            //record event with key segmentation
+            Countly.instance().events().recordEvent("test-recordEvent-Filler", segmentation);
+
+            //check if event was recorded correctly and size of event queue is equal to size of events in queue
+            List<EventImpl> events = TestUtils.getCurrentEventQueue(moduleEvents.ctx.getContext(), moduleEvents.L);
+            EventImpl q1 = events.get(0);
+            EventImpl q2 = events.get(1);
+            Assert.assertEquals(2, moduleEvents.eventQueue.size);
+            Assert.assertEquals(2, events.size());
+            Assert.assertEquals("test-recordEvent", q1.key);
+            Assert.assertEquals(67, q1.segmentation.get("weight"));
+            Assert.assertNotEquals(segmentation, q1.segmentation);
+            Assert.assertEquals(segmentation, q2.segmentation);
+            Assert.assertEquals("test-recordEvent-Filler", q2.key);
+        } finally {
+            moduleEvents.eventQueue.clear();
+        }
+    }
+
+    /**
+     * This test case re-inits Countly and tries to read
+     * existing event queue from storage
+     */
+    @Test
+    public void testInDiskEventQueue(){
+        Assert.assertEquals(0, moduleEvents.eventQueue.size);
+
+        //create segmentation
+        Map<String, Object> segmentation = new HashMap<>();
+        segmentation.put("exam_name", "CENG 101");
+        segmentation.put("score", 100);
+        segmentation.put("cheated", false);
+
+        //record event with key segmentation
+        Countly.instance().events().recordEvent("testInDiskEventQueue", segmentation);
+
+        //now purposely re-init Countly
+        stop();
+        System.out.println("Countly stopped");
+        init();
+        start();
+
+        //check if event was recorded correctly and size of event queue is equal to size of events in queue
+        List<EventImpl> events = TestUtils.getCurrentEventQueue(moduleEvents.ctx.getContext(), moduleEvents.L);
+        Assert.assertEquals(1, moduleEvents.eventQueue.size);
+        Assert.assertEquals(1, events.size());
+
+        //check if event was recorded correctly
+        EventImpl event = events.get(0);
+        Assert.assertEquals("testInDiskEventQueue", event.key);
+        Assert.assertEquals(segmentation, event.segmentation);
+    }
+}