Index: build/test/test.tcl
==================================================================
--- build/test/test.tcl
+++ build/test/test.tcl
@@ -2,31 +2,35 @@
 
 lappend auto_path [file join [file dirname [info script]] .. ..]
 
 package require nano
 
+proc test_selftest {} {
+	::nano::internal::selfTest
+	return true
+}
 proc test_signatures {} {
 	# Detached signature
 	set data [binary decode hex 0000000000000000000000000000000000000000000000000000000000000000]
 	set key  [binary decode hex C4D214F19E706E9C7487CEF00DE8059200C32414F0ED82E5E33B523AEDF719BA]
 	set sig  [string toupper [binary encode hex [::nano::internal::signDetached $data $key]]]
 	set sig_expected 1C2DE9B8A71215F949A11BBEA7EFA4ECD67A8C2B5A9AD98AE6B1AB7F7A3D2CFD715F570309148C7B39C346FB9B91B321D7E75BD598F271AF31AB60A99D086709
 
 	if {$sig ne $sig_expected} {
-		puts "\[FAIL\] Got: $sig"
-		puts "\[FAIL\] Exp: $sig_expected"
+		puts "\[1.FAIL\] Got: $sig"
+		puts "\[1.FAIL\] Exp: $sig_expected"
 
 		return false
 	}
 
 	# Public key generation
 	set pubKey_expected "FE1934767B26FA05A1526E40101E899959AB088FA1C4219865F33669E8EB99B6"
 	set pubKey [::nano::internal::publicKey $key]
 	set pubKey [string toupper [binary encode hex $pubKey]]
 	if {$pubKey ne $pubKey_expected} {
-		puts "\[FAIL\] Got: $pubKey"
-		puts "\[FAIL\] Exp: $pubKey_expected"
+		puts "\[2.FAIL\] Got: $pubKey"
+		puts "\[2.FAIL\] Exp: $pubKey_expected"
 
 		return false
 	}
 
 	# Detached signature verification
@@ -35,21 +39,21 @@
 	set key    [binary decode hex C4D214F19E706E9C7487CEF00DE8059200C32414F0ED82E5E33B523AEDF719BA]
 	set pubKey [::nano::internal::publicKey $key]
 	set sig    [::nano::internal::signDetached $data $key]
 	set verified [::nano::internal::verifyDetached $data $sig $pubKey]
 	if {!$verified} {
-		puts "\[FAIL\] Got: $verified"
-		puts "\[FAIL\] Exp: true"
+		puts "\[3.FAIL\] Got: $verified"
+		puts "\[3.FAIL\] Exp: true"
 		return false
 	}
 
 	## Negative
 	set pubKey [binary decode hex "7E0008FAD05BD9E22A8DEBA963CE3C9C769BC01B00974226D264C9078A7A98A8"]
 	set verified [::nano::internal::verifyDetached $data $sig $pubKey]
 	if {$verified} {
-		puts "\[FAIL\] Got: $verified"
-		puts "\[FAIL\] Exp: false"
+		puts "\[4.FAIL\] Got: $verified"
+		puts "\[4.FAIL\] Exp: false"
 		return false
 	}
 
 	return true
 }
@@ -58,25 +62,42 @@
 	# Basic test
 	set data [binary decode hex 4451686437A2BF5C4759100DE2ADE0F39B6877275AF997906B71B1A8EF1550A2]
 	set hash [binary encode hex [::nano::internal::hashData $data]]
 	set hash_expected "84ac733547d71c312e707508646008a9d8f84f7093e60ca91e4eb376365ac1921fdde6e8ccb3875ea12369d9f6fb02237f51f4c05f3555e57d11800deda7319f"
 	if {$hash ne $hash_expected} {
-		puts "\[FAIL\] Got: $hash"
-		puts "\[FAIL\] Exp: $hash_expected"
+		puts "\[1.FAIL\] Got: $hash"
+		puts "\[1.FAIL\] Exp: $hash_expected"
 
 		return false
 	}
 
 	return true
 }
 
 proc test_keygeneration {} {
 	set key [::nano::internal::generateKey]
-	puts "key=$key"
+	if {[string length $key] != 32} {
+		puts "\[1.FAIL\] Got: [string length $key]"
+		puts "\[1.FAIL\] Exp: 32"
+
+		return false
+	}
+
+	set data   [binary decode hex 0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF0123456789ABCDEF]
+	set pubKey [::nano::internal::publicKey $key]
+	set sig    [::nano::internal::signDetached $data $key]
+	set verified [::nano::internal::verifyDetached $data $sig $pubKey]
+	if {!$verified} {
+		puts "\[2.FAIL\] Got: $verified"
+		puts "\[2.FAIL\] Exp: true"
+	}
+
+	return true
 }
 
 set tests {
+	selftest
 	signatures
 	hashing
 	keygeneration
 }