diff --git a/lslopt/lslbasefuncs.py b/lslopt/lslbasefuncs.py
index b30b6aa..971e476 100644
--- a/lslopt/lslbasefuncs.py
+++ b/lslopt/lslbasefuncs.py
@@ -1325,7 +1325,7 @@ def llHMAC(pwd, data, alg):
     elif alg == u'sha512':
         hash = hashlib.sha512()
     if hash is None:
-        raise ELSLCantCompute  # we don't have info on how it behaves yet
+        raise ELSLCantCompute  # spews error
     # Calculate the HMAC here, to avoid requiring yet another module
     if len(pwd) > hash.block_size:
         tmp = hash.copy()
diff --git a/unit_tests/expr.suite/llhmac.lsl b/unit_tests/expr.suite/llhmac.lsl
index aa17e0b..fc76d48 100644
--- a/unit_tests/expr.suite/llhmac.lsl
+++ b/unit_tests/expr.suite/llhmac.lsl
@@ -1,4 +1,16 @@
-[ llHMAC("a", "b", "sha1")
+[ llHMAC("", "", "md5")
+, llHMAC("", "", "sha1")
+, llHMAC("", "", "sha224")
+, llHMAC("", "", "sha256")
+, llHMAC("", "", "sha384")
+, llHMAC("", "", "sha512")
+, llHMAC("a", "b", "md5")
+, llHMAC("a", "b", "sha1")
+, llHMAC("a", "b", "sha224")
+, llHMAC("a", "b", "sha256")
+, llHMAC("a", "b", "sha384")
+, llHMAC("a", "b", "sha512")
+// example from the wiki (?)
 , llHMAC("-----BEGIN RSA PRIVATE KEY-----
 MIIEogIBAAKCAQEAqxXSIhFHzYO9UNEUvMMXwhB4vf32fPirCxxV/w4m88jKPmFH
 QQe9DOwj7illmvg+81vzBNGt+uNYy/2zFegUtwvxKCEioeoanRpPcvn9r/d/kXad
diff --git a/unit_tests/expr.suite/llhmac.out b/unit_tests/expr.suite/llhmac.out
index e54502e..94a589b 100644
--- a/unit_tests/expr.suite/llhmac.out
+++ b/unit_tests/expr.suite/llhmac.out
@@ -1,3 +1,14 @@
-[ "ZleFVoaCOYbIdDYnMROXUgFMtgs="
+[ "dOb3KYqcLRaJNfWMAButiA=="
+, "+9sdGxiqbAgyS31ktx+3Y3BpDh0="
+, "XOFPcolGYiE+J0jSprojS3QmORDO3eL1qScVJA=="
+, "thNnmggU2ex3L5XXeMNfxf8Wl8STcVZTxscSFEKSxa0="
+, "bB8u6Tj60uJL2RKYR0OCyiGMdds9g+EUs9Q2d3bRTTVRKJ516CCc1LeSMChAI0rc"
+, "uTbO6Gyfh6pdPG8uhMtaQjml/lBICm7Ga3CrWx9KxnMMbFFUIbMn7B1pQC5T37Sa1zgesGezOP17DLIiRyJdRw=="
+, "5jDnum4zM2HVxialQtChxg=="
+, "ZleFVoaCOYbIdDYnMROXUgFMtgs="
+, "K6UDpxjSoOO8Ciu7RB22U2tcHSSvyTOgKM1bbg=="
+, "CN4ymTHilWg3dqqaQ1Kb0LJ1KG3zFgMAxJuk6EGDMBM="
+, "spNXIbhwG93+hStMAWU+44zMRJg+DspwqqSoVl2RJZEvZVZK9Z4s7Hg6y8mXPxR7"
+, "2YlC1pp1xhoI0rxitjrtqcj+bjRJO6EFFRAjQKMkdLBhgBPBLnm2mmWQjie0VZLDm7SgO1qE41sBDvyQMO2N+A=="
 , "xK/3hcR1IVpVK9vftoztuVRGZFE="
 ]
\ No newline at end of file
diff --git a/unit_tests/expr.suite/llhmac.skp b/unit_tests/expr.suite/llhmac.skp
deleted file mode 100644
index e69de29..0000000