diff --git a/cl-random.asd b/cl-random.asd
index ecf0c8c..b323385 100644
--- a/cl-random.asd
+++ b/cl-random.asd
@@ -15,7 +15,7 @@
   ((:file "internals")
    (:file "package")
    (:file "random")
-   ;; (:file "discrete")
+   (:file "discrete")
    (:file "univariate")
    ;; (:file "continuous-time")
    ;; (:file "statistics")
diff --git a/tests/package.lisp b/tests/package.lisp
index 0a5c329..2997268 100644
--- a/tests/package.lisp
+++ b/tests/package.lisp
@@ -1,9 +1,16 @@
 (defpackage cl-random-tests
-  (:use #:cl #:alexandria #:iterate #:let-plus #:anaphora #:lift #:cl-random
-        #:cl-num-utils #:lla)
-  (:shadowing-import-from #:cl-random #:mean #:variance #:median ; also in ALEXANDRIA
-                          #:displace-array ; no longer in ALEXANDRIA, TODO remove in 2012 June
+  (:use #:cl
+        #:alexandria
+        #:anaphora
+        #:cl-num-utils.elementwise
+        #:cl-num-utils.matrix-shorthand
+        #:cl-random
+        #:iterate
+        #:let-plus
+        #:lift
+        #:lla
+        )
+  (:shadowing-import-from #:cl-num-utils #:mean #:variance #:median ; also in ALEXANDRIA
                           #:sum         ; also in ITERATE
                           )
-  (:export #:random-y-x #:run)
-  (:import-from #:cl-num-utils-tests #:vector* #:array*))
+  (:export #:random-y-x #:run))