Fixed module export (oops!)
added tests