diff --git a/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/SmokeTest.kt b/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/SmokeTest.kt
index e9aca50..28c1665 100644
--- a/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/SmokeTest.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/SmokeTest.kt
@@ -19,7 +19,7 @@ class SmokeTest {
         testBlocking {
             LibsodiumInitializer.initialize()
             val hashResult = GenericHash.genericHash("Hello".encodeToUByteArray(), 64)
-            println(hashResult.toHexString())
+            println("Smoke test: ${hashResult.toHexString()}")
             assertTrue {
                 "EF15EAF92D5E335345A3E1D977BC7D8797C3D275717CC1B10AF79C93CDA01AEB2A0C59BC02E2BDF9380FD1B54EB9E1669026930CCC24BD49748E65F9A6B2EE68".toLowerCase() == hashResult.toHexString()
             }
diff --git a/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHashTest.kt b/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHashTest.kt
new file mode 100644
index 0000000..d39c387
--- /dev/null
+++ b/multiplatform-crypto-libsodium-bindings/src/commonTest/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHashTest.kt
@@ -0,0 +1,74 @@
+package com.ionspin.kotlin.crypto.generichash
+
+import com.ionspin.kotlin.crypto.LibsodiumInitializer
+import com.ionspin.kotlin.crypto.util.encodeToUByteArray
+import com.ionspin.kotlin.crypto.util.testBlocking
+import com.ionspin.kotlin.crypto.util.toHexString
+import kotlin.test.BeforeTest
+import kotlin.test.Test
+import kotlin.test.assertTrue
+
+/**
+ * Created by Ugljesa Jovanovic
+ * ugljesa.jovanovic@ionspin.com
+ * on 26-Aug-2020
+ */
+class GenericHashTest {
+
+
+    @Test
+    fun testGenericHash() {
+        LibsodiumInitializer.initializeWithCallback {
+            val inputString = "1234567890"
+            val inputStringBuilder = StringBuilder()
+            for (i in 0 until 14) {
+                inputStringBuilder.append(inputString)
+            }
+            val input = inputStringBuilder.toString().encodeToUByteArray()
+            val expectedResult = ubyteArrayOf(
+                //@formatter:off
+                0x2fU, 0x49U, 0xaeU, 0xb6U, 0x13U, 0xe3U, 0x4eU, 0x92U, 0x4eU, 0x17U, 0x5aU, 0x6aU, 0xf2U, 0xfaU, 0xadU,
+                0x7bU, 0xc7U, 0x82U, 0x35U, 0xf9U, 0xc5U, 0xe4U, 0x61U, 0xc6U, 0x8fU, 0xd5U, 0xb4U, 0x07U, 0xeeU, 0x8eU,
+                0x2fU, 0x0dU, 0x2fU, 0xb4U, 0xc0U, 0x7dU, 0x7eU, 0x4aU, 0x72U, 0x40U, 0x46U, 0x12U, 0xd9U, 0x28U, 0x99U,
+                0xafU, 0x8aU, 0x32U, 0x8fU, 0x3bU, 0x61U, 0x4eU, 0xd7U, 0x72U, 0x44U, 0xb4U, 0x81U, 0x15U, 0x1dU, 0x40U,
+                0xb1U, 0x1eU, 0x32U, 0xa4U
+                //@formatter:on
+            )
+
+
+            val result = GenericHash.genericHash(input, 64)
+            println("GenericHash result: ${result.toHexString()}")
+            assertTrue {
+                result.contentEquals(expectedResult)
+            }
+        }
+
+    }
+
+    @Test
+    fun testGenericHashMultipart() {
+        LibsodiumInitializer.initializeWithCallback {
+            val updates = 14
+            val input = "1234567890"
+            val expectedResult = ubyteArrayOf(
+                //@formatter:off
+                0x2fU, 0x49U, 0xaeU, 0xb6U, 0x13U, 0xe3U, 0x4eU, 0x92U, 0x4eU, 0x17U, 0x5aU, 0x6aU, 0xf2U, 0xfaU, 0xadU,
+                0x7bU, 0xc7U, 0x82U, 0x35U, 0xf9U, 0xc5U, 0xe4U, 0x61U, 0xc6U, 0x8fU, 0xd5U, 0xb4U, 0x07U, 0xeeU, 0x8eU,
+                0x2fU, 0x0dU, 0x2fU, 0xb4U, 0xc0U, 0x7dU, 0x7eU, 0x4aU, 0x72U, 0x40U, 0x46U, 0x12U, 0xd9U, 0x28U, 0x99U,
+                0xafU, 0x8aU, 0x32U, 0x8fU, 0x3bU, 0x61U, 0x4eU, 0xd7U, 0x72U, 0x44U, 0xb4U, 0x81U, 0x15U, 0x1dU, 0x40U,
+                0xb1U, 0x1eU, 0x32U, 0xa4U
+                //@formatter:on
+            )
+
+            val genericHashState = GenericHash.genericHashInit(64)
+            for (i in 0 until updates) {
+                GenericHash.genericHashUpdate(genericHashState, input.encodeToUByteArray())
+            }
+            val result = GenericHash.genericHashFinal(genericHashState)
+            println("GenericHash result: ${result.toHexString()}")
+            assertTrue {
+                result.contentEquals(expectedResult)
+            }
+        }
+    }
+}
diff --git a/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHash.kt b/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHash.kt
index 7a91cc1..8055387 100644
--- a/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHash.kt
+++ b/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/generichash/GenericHash.kt
@@ -30,7 +30,7 @@ actual object GenericHash {
         requestedHashLength: Int,
         key: UByteArray?
     ): GenericHashState {
-        val state = getSodium().crypto_generichash_init(key.toUInt8Array(), requestedHashLength)
+        val state = getSodium().crypto_generichash_init(key?.toUInt8Array() ?: Uint8Array(0), requestedHashLength)
         return GenericHashState(requestedHashLength, state)
     }
 
diff --git a/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStream.kt b/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStream.kt
new file mode 100644
index 0000000..8d9974e
--- /dev/null
+++ b/multiplatform-crypto-libsodium-bindings/src/jsMain/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStream.kt
@@ -0,0 +1,34 @@
+package com.ionspin.kotlin.crypto.secretstream
+
+actual typealias SecretStreamState = Any
+
+actual object SecretStream {
+    actual fun xChaCha20Poly1305InitPush(key: UByteArray): SecretStreamStateAndHeader {
+        TODO("not implemented yet")
+    }
+
+    actual fun xChaCha20Poly1305Push(
+        state: SecretStreamState,
+        message: UByteArray,
+        additionalData: UByteArray,
+        tag: UByte
+    ): UByteArray {
+        TODO("not implemented yet")
+    }
+
+    actual fun xChaCha20Poly1305InitPull(
+        key: UByteArray,
+        header: UByteArray
+    ): SecretStreamStateAndHeader {
+        TODO("not implemented yet")
+    }
+
+    actual fun xChaCha20Poly1305Pull(
+        state: SecretStreamState,
+        ciphertext: UByteArray,
+        additionalData: UByteArray
+    ): DecryptedDataAndTag {
+        TODO("not implemented yet")
+    }
+
+}
diff --git a/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStream.kt b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStream.kt
new file mode 100644
index 0000000..e03d3ad
--- /dev/null
+++ b/multiplatform-crypto-libsodium-bindings/src/jvmMain/kotlin/com/ionspin/kotlin/crypto/secretstream/SecretStream.kt
@@ -0,0 +1,38 @@
+package com.ionspin.kotlin.crypto.secretstream
+
+import com.goterl.lazycode.lazysodium.interfaces.SecretStream
+import com.ionspin.kotlin.crypto.LibsodiumInitializer.sodium
+
+actual typealias SecretStreamState = SecretStream.State
+
+actual object SecretStream {
+    actual fun xChaCha20Poly1305InitPush(key: UByteArray): SecretStreamStateAndHeader {
+        TODO("not implemented yet")
+//        sodium.crypto_secretstream_xchacha20poly1305_init_push()
+    }
+
+    actual fun xChaCha20Poly1305Push(
+        state: SecretStreamState,
+        message: UByteArray,
+        additionalData: UByteArray,
+        tag: UByte
+    ): UByteArray {
+        TODO("not implemented yet")
+    }
+
+    actual fun xChaCha20Poly1305InitPull(
+        key: UByteArray,
+        header: UByteArray
+    ): SecretStreamStateAndHeader {
+        TODO("not implemented yet")
+    }
+
+    actual fun xChaCha20Poly1305Pull(
+        state: SecretStreamState,
+        ciphertext: UByteArray,
+        additionalData: UByteArray
+    ): DecryptedDataAndTag {
+        TODO("not implemented yet")
+    }
+
+}