diff --git a/internal/cryptocore/crypto_api.go b/internal/cryptocore/cryptocore.go
similarity index 94%
rename from internal/cryptocore/crypto_api.go
rename to internal/cryptocore/cryptocore.go
index 0db9bbb..f286896 100644
--- a/internal/cryptocore/crypto_api.go
+++ b/internal/cryptocore/cryptocore.go
@@ -18,6 +18,7 @@ type CryptoCore struct {
 	IVLen       int
 }
 
+// "New" returns a new CryptoCore object or panics.
 func New(key []byte, useOpenssl bool, GCMIV128 bool) *CryptoCore {
 
 	if len(key) != KeyLen {
diff --git a/internal/cryptocore/cryptocore_test.go b/internal/cryptocore/cryptocore_test.go
new file mode 100644
index 0000000..fd6a300
--- /dev/null
+++ b/internal/cryptocore/cryptocore_test.go
@@ -0,0 +1,35 @@
+package cryptocore
+
+import (
+	"testing"
+)
+
+// "New" should accept all param combinations
+func TestCryptoCoreNew(t *testing.T) {
+	key := make([]byte, 32)
+
+	c := New(key, true, true)
+	if c.IVLen != 16 {
+		t.Fail()
+	}
+	c = New(key, true, false)
+	if c.IVLen != 12 {
+		t.Fail()
+	}
+	c = New(key, false, true)
+	if c.IVLen != 16 {
+		t.Fail()
+	}
+}
+
+// "New" should panic on any key not 32 bytes long
+func TestNewPanic(t *testing.T) {
+	defer func() {
+		if r := recover(); r == nil {
+			t.Errorf("The code did not panic")
+		}
+	}()
+
+	key := make([]byte, 16)
+	New(key, true, true)
+}