diff --git a/test-suite.lisp b/test-suite.lisp
index 596cac3..ee0ce14 100644
--- a/test-suite.lisp
+++ b/test-suite.lisp
@@ -36,44 +36,85 @@
   (is (typep *foo-ht* 'hash-table))
   
   (with-custom-hash-table
-    (setf (gethash 1 *foo-ht*) 1
-          (gethash 10 *foo-ht*) 10
-          (gethash 20 *foo-ht*) 20)
-    ;; (1 . 1) (10 . 10) (20 . 20)
-    (let ((*foo-equal-count* 0))
-      (is (= (gethash 1 *foo-ht*) 1))
-      (is (plusp *foo-equal-count*)))
-    (let ((*foo-equal-count* 0))
-      (is (null (gethash 30 *foo-ht*)))
-      #+custom-hash-table-fallback
-      (is (= 2 *foo-equal-count*))) ;; tested 10, 20
-    (is (remhash 1 *foo-ht*))
-    ;; (10 . 10) (20 . 20)
-    (is (not (remhash 1 *foo-ht*)))
-    (is (= (hash-table-count *foo-ht*) 2))
-    (setf (gethash 1 *foo-ht*) 1)
-    (let ((expected '((1 . 1) (10 . 10) (20 . 20))))
-      (flet ((expected-p (set)
-               (and (null (set-difference set expected :test 'equal))
-                    (null (set-difference expected set :test 'equal)))))
-        ;; Check MAPHASH
-        (let (items)
-          (maphash (lambda (k v) (push (cons k v) items)) *foo-ht*)
-          (is (expected-p items)))
-        ;; Check WITH-HASH-TABLE-ITERATOR
-        (let (items)
-          (with-hash-table-iterator (next *foo-ht*)
-            (loop named iter-test
-                do (multiple-value-bind (entry-p key val) (next)
-                     (if entry-p
-                         (push (cons key val) items)
-                       (return-from iter-test)))))
-          (is (expected-p items)))))
-    (clrhash *foo-ht*)
-    (is (zerop (hash-table-count *foo-ht*)))
-    (is (plusp (hash-table-rehash-size *foo-ht*)))
-    (is (plusp (hash-table-rehash-threshold *foo-ht*)))
-    (is (plusp (hash-table-size *foo-ht*))))
+      (is (hash-table-p (make-hash-table :test 'eql))))
+  
+  (let ((ht *foo-ht*))
+    
+    (with-custom-hash-table
+        (is (hash-table-p ht))
+      
+        (setf (gethash 1 ht) 1
+              (gethash 10 ht) 10
+              (gethash 20 ht) 20)
+      ;; (1 . 1) (10 . 10) (20 . 20)
+      (let ((*foo-equal-count* 0))
+        (is (= (gethash 1 ht) 1))
+        (is (plusp *foo-equal-count*)))
+      (let ((*foo-equal-count* 0))
+        (is (null (gethash 30 ht)))
+        #+custom-hash-table-fallback
+        (is (= 2 *foo-equal-count*))) ;; tested 10, 20
+      (is (remhash 1 ht))
+      ;; (10 . 10) (20 . 20)
+      (is (not (remhash 1 ht)))
+      (is (= (hash-table-count ht) 2))
+      (setf (gethash 1 ht) 1)
+      (let ((expected '((1 . 1) (10 . 10) (20 . 20))))
+        (flet ((expected-p (set)
+                 (and (null (set-difference set expected :test 'equal))
+                      (null (set-difference expected set :test 'equal)))))
+          ;; Check MAPHASH
+          (let (items)
+            (maphash (lambda (k v) (push (cons k v) items)) ht)
+            (is (expected-p items)))
+          ;; Check WITH-HASH-TABLE-ITERATOR
+          (let (items)
+            (with-hash-table-iterator (next ht)
+              (loop named iter-test
+                  do (multiple-value-bind (entry-p key val) (next)
+                       (if entry-p
+                           (push (cons key val) items)
+                         (return-from iter-test)))))
+            (is (expected-p items)))))
+      
+      (clrhash ht)
+      (is (zerop (hash-table-count ht)))
+      (is (plusp (hash-table-rehash-size ht)))
+      (is (plusp (hash-table-rehash-threshold ht)))
+      (is (not (minusp (hash-table-size ht))))
+      
+      (dotimes (i 1000)
+        (setf (gethash i ht) (* 2 i))
+        (is (= (hash-table-count ht) (1+ i))))
+      ;; HT: {1 -> 2; 2 -> 4; ...; 999 -> 1998}
+      
+      (loop for i from 400 to 600
+          do (is (= (gethash i ht) (* 2 i)))
+             (setf (gethash i ht) (* 3 i)))
+      ;; HT: {1 -> 2; 399 -> 798;  400 -> 1200; ...; 600 -> 1800;  601 -> 1202; ...; 999 -> 1998}
+      
+      (is (= (hash-table-count ht) 1000))
+      (dotimes (i 1000)
+        (is (= (gethash i ht) (if (<= 400 i 600) (* 3 i) (* 2 i)))))
+      
+      (dotimes (i 1000)
+        (is (remhash i ht))
+        (is (not (remhash (+ i 1000) ht)))
+        (is (= (hash-table-count ht) (- 999 i))))))
+  
+  (signals error (eval '(with-custom-hash-table 
+                         (loop for x being the hash-key in (make-hash-table)
+                             do nil))))
+  (signals error (eval '(with-custom-hash-table 
+                         (loop for x being the hash-keys in (make-hash-table)
+                             do nil))))
+  (signals error (eval '(with-custom-hash-table 
+                         (loop for x being the :hash-value in (make-hash-table)
+                             do nil))))
+  (signals error (eval '(with-custom-hash-table 
+                         (loop for x being the #:hash-values in (make-hash-table)
+                             do nil))))
+  
   (terpri)
   (format t "Test success!~%")
   t)