diff --git a/tests/15list.tests b/tests/15list.tests
index 6d43064f7..88aef3c49 100644
--- a/tests/15list.tests
+++ b/tests/15list.tests
@@ -3,7 +3,6 @@ TESTING "Linked Lists" ./test-llist
 TEST "init nodes" basic <<END
 out: 1
 out: 1
-return: 0
 END
 
 TEST "insert nodes" nodeinsert <<END
@@ -15,41 +14,46 @@ out: 1
 out: 1
 out: 1
 out: 1
-return: 0
-END
-
-
-
-echo TODO; cat <<END
-#define LLIST_FOREACH(list, node)               \
-#define LLIST_FOREACH_REV(list, node)           \
-#define LLIST_WHILE_HEAD(list, head)            \
-#define LLIST_WHILE_TAIL(list, tail)            \
-LLIST_FUNC (int llist_is_head (const_LList self, const_LList head),
-LLIST_FUNC (int llist_is_tail (const_LList self, const_LList tail),
-LLIST_FUNC (int llist_is_end (const_LList self, const_LList end),
-LLIST_FUNC (int llist_is_member (const_LList self, const_LList member),
-LLIST_FUNC (int llist_is_before_after (const_LList self, const_LList before, const_LList after),
-LLIST_FUNC (unsigned llist_count (const_LList self),
-LLIST_FUNC (void llist_unlink_fast_ (LList self),
-LLIST_FUNC (LList llist_unlink (LList self),
-LLIST_FUNC (LList llist_relocate (LList self),
-LLIST_FUNC (LList llist_insertlist_next (LList self, LList next),
-LLIST_FUNC (LList llist_insertlist_prev (LList self, LList prev),
-PLANNED LLIST_FUNC (LList llist_insertafter_range (LList self, LList start, LList end),
-PLANNED LLIST_FUNC (LList llist_inserbefore_range (LList self, LList start, LList end),
-LLIST_FUNC (LList llist_advance (LList self),
-LLIST_FUNC (LList llist_retreat (LList self),
-LLIST_FUNC (void llist_forward (LList_ref self),
-LLIST_FUNC (void llist_backward (LList_ref self),
-LLIST_FUNC (LList llist_nth (LList self, int n),
-LLIST_FUNC (LList llist_get_nth_stop (LList self, int n, const_LList stop),
-#define llist_insert_head(list, element) llist_insert_next (list, element)
-#define llist_insert_tail(list, element) llist_insert_prev (list, element)
-#define llist_head llist_next
-#define llist_tail llist_prev
+out: 3
+END
+
+TEST "remaining predicates" predicates <<END
+out: 1
+out: 1
+out: 0
+out: 0
+out: 1
+out: 1
+out: 0
+out: 1
+out: 0
+out: 0
+END
+
+TEST "unlink" unlink <<END
+out: node4 node3 node2 node1 .
+out: node1 node4 .
+out: 1
+out: 1
+out: 1
+END
+
+TEST "whiles" whiles <<END
+out: node4 node3 node2 node1 .
+out: .
+out: .
 END
 
 
+# not yet tested functions, write tests when needed
+PLANNED "llist_relocate"
+PLANNED "llist_insertlist_next"
+PLANNED "llist_insertlist_prev"
+PLANNED "llist_insertafter_range"
+PLANNED "llist_inserbefore_range"
+PLANNED "llist_advance"
+PLANNED "llist_retreat"
+PLANNED "list_nth"
+PLANNED "llist_get_nth_stop"
 
 
diff --git a/tests/library/test-llist.c b/tests/library/test-llist.c
index 774e91069..66cc50ade 100644
--- a/tests/library/test-llist.c
+++ b/tests/library/test-llist.c
@@ -64,7 +64,129 @@ main (int argc, char** argv)
       printf ("%d\n", llist_next (&node3) == &node1);
       printf ("%d\n", llist_next (&node1) == &node2);
       printf ("%d\n", llist_prev (&list) == &node2);
-      
+      printf ("%d\n", llist_count (&list));
+    }
+  else if (!strcmp(argv[1], "predicates"))
+    {
+      LLIST_AUTO (list);
+      LLIST_AUTO (node1);
+      LLIST_AUTO (node2);
+      LLIST_AUTO (node3);
+      LLIST_AUTO (node4);
+      LLIST_AUTO (nil);
+
+      llist_insert_tail (&list, &node2);
+      llist_insert_tail (&list, &node3);
+      llist_insert_tail (&list, &node4);
+      llist_insert_head (&list, &node1);
+
+      printf ("%d\n", llist_is_head (&list, &node1));
+      printf ("%d\n", llist_is_tail (&list, &node4));
+      printf ("%d\n", llist_is_head (&list, &node4));
+      printf ("%d\n", llist_is_tail (&list, &node1));
+      printf ("%d\n", llist_is_end (&list, &list));
+      printf ("%d\n", llist_is_member (&list, &node3));
+      printf ("%d\n", llist_is_member (&list, &nil));
+
+      printf ("%d\n", llist_is_before_after (&list, &node1, &node3));
+      printf ("%d\n", llist_is_before_after (&list, &node3, &node1));
+      printf ("%d\n", llist_is_before_after (&list, &node1, &nil));
+    }
+  else if (!strcmp(argv[1], "unlink"))
+    {
+      LLIST_AUTO (list);
+      LLIST_AUTO (node1);
+      LLIST_AUTO (node2);
+      LLIST_AUTO (node3);
+      LLIST_AUTO (node4);
+      LLIST_AUTO (nil);
+
+      llist_insert_tail (&list, &node2);
+      llist_insert_tail (&list, &node3);
+      llist_insert_tail (&list, &node4);
+      llist_insert_head (&list, &node1);
+
+      LLIST_FOREACH_REV (&list, itr)
+        {
+          if(itr == &node1) printf ("node1 ");
+          else if(itr == &node2) printf ("node2 ");
+          else if(itr == &node3) printf ("node3 ");
+          else if(itr == &node4) printf ("node4 ");
+          else printf ("unknown ");
+        }
+      printf (".\n");
+
+      llist_unlink (&nil);
+      llist_unlink (&node2);
+      llist_unlink (&node3);
+
+      LLIST_FOREACH (&list, itr)
+        {
+          if(itr == &node1) printf ("node1 ");
+          else if(itr == &node2) printf ("node2 ");
+          else if(itr == &node3) printf ("node3 ");
+          else if(itr == &node4) printf ("node4 ");
+          else printf ("unknown ");
+        }
+      printf (".\n");
+      printf ("%d\n", llist_is_empty (&node2));
+      printf ("%d\n", llist_is_empty (&node3));
+      printf ("%d\n", llist_is_empty (&nil));
+    }
+  else if (!strcmp(argv[1], "whiles"))
+    {
+      LLIST_AUTO (list);
+      LLIST_AUTO (node1);
+      LLIST_AUTO (node2);
+      LLIST_AUTO (node3);
+      LLIST_AUTO (node4);
+      LLIST_AUTO (nil);
+
+      llist_insert_tail (&list, &node2);
+      llist_insert_tail (&list, &node3);
+      llist_insert_tail (&list, &node4);
+      llist_insert_head (&list, &node1);
+
+      LLIST_FOREACH_REV (&list, itr)
+        {
+          if(itr == &node1) printf ("node1 ");
+          else if(itr == &node2) printf ("node2 ");
+          else if(itr == &node3) printf ("node3 ");
+          else if(itr == &node4) printf ("node4 ");
+          else printf ("unknown ");
+        }
+      printf (".\n");
+
+      LLIST_WHILE_HEAD (&list, head)
+        llist_unlink (head);
+
+      LLIST_FOREACH (&list, itr)
+        {
+          if(itr == &node1) printf ("node1 ");
+          else if(itr == &node2) printf ("node2 ");
+          else if(itr == &node3) printf ("node3 ");
+          else if(itr == &node4) printf ("node4 ");
+          else printf ("unknown ");
+        }
+      printf (".\n");
+
+      llist_insert_tail (&list, &node2);
+      llist_insert_tail (&list, &node3);
+      llist_insert_tail (&list, &node4);
+      llist_insert_head (&list, &node1);
+
+      LLIST_WHILE_TAIL (&list, tail)
+        llist_unlink (tail);
+
+      LLIST_FOREACH (&list, itr)
+        {
+          if(itr == &node1) printf ("node1 ");
+          else if(itr == &node2) printf ("node2 ");
+          else if(itr == &node3) printf ("node3 ");
+          else if(itr == &node4) printf ("node4 ");
+          else printf ("unknown ");
+        }
+      printf (".\n");
     }
   else
     return 1;