diff --git a/test/b32_test.js b/test/b32_test.js
new file mode 100644
index 0000000..c77b097
--- /dev/null
+++ b/test/b32_test.js
@@ -0,0 +1,19 @@
+var b32 = require('../lib/base32');
+var assert = require('assert');
+
+describe('Base32 module test', function() {
+
+    var a = b32.Base32;
+    
+    describe('static decode() function', function() {
+        it("should print 'static Base32.decode'", function() {
+            assert.equal("static Base32.decode", a.decode());
+        });
+    });
+
+    describe('static random_gen() function', function() {
+        it("should print 'static Base32.random_gen'", function() {
+            assert.equal("static Base32.random_gen", a.random_gen());
+        })
+    })
+});
diff --git a/tests/hotp_test.js b/test/hotp_test.js
similarity index 100%
rename from tests/hotp_test.js
rename to test/hotp_test.js
diff --git a/tests/otp_test.js b/test/otp_test.js
similarity index 100%
rename from tests/otp_test.js
rename to test/otp_test.js
diff --git a/tests/totp_test.js b/test/totp_test.js
similarity index 100%
rename from tests/totp_test.js
rename to test/totp_test.js
diff --git a/tests/b32_test.js b/tests/b32_test.js
deleted file mode 100644
index e69de29..0000000