Index: kernel/generic/src/console/cmd.c
===================================================================
--- kernel/generic/src/console/cmd.c	(revision 0313ff0ebb436deb6a48b67d17b944f3fc79f731)
+++ kernel/generic/src/console/cmd.c	(revision 771cd22b02d9fec4d7d601d12b2979a07abb50db)
@@ -57,5 +57,4 @@
 #include <mm/tlb.h>
 #include <arch/mm/tlb.h>
-#include <mm/as.h>
 #include <mm/frame.h>
 #include <main/version.h>
@@ -860,7 +859,7 @@
 }
 
-static void test_wrapper(void *arg)
-{
-	test_t *test = (test_t *) arg;
+static bool run_test(const test_t *test)
+{
+	printf("%s\t\t%s\n", test->name, test->desc);
 	
 	/* Update and read thread accounting
@@ -886,37 +885,9 @@
 	if (ret == NULL) {
 		printf("Test passed\n");
-//		return true;
-		return;
+		return true;
 	}
 
 	printf("%s\n", ret);
-//	return false;
-}
-
-static bool run_test(const test_t *test)
-{
-	printf("%s\t\t%s\n", test->name, test->desc);
-	
-	/* Create separate task and thread
-	   for the test */
-	task_t *ta = task_create(AS_KERNEL, "test");
-	if (ta == NULL) {
-		printf("Unable to create test task\n");
-		return false;
-	}
-	
-	thread_t *t = thread_create(test_wrapper, (void *) test, ta, 0, "test_main");
-	if (t == NULL) {
-		printf("Unable to create test main thread\n");
-		task_destroy(ta);
-		return false;
-	}
-	
-	/* Run the test */
-	thread_ready(t);
-	thread_join(t);
-	thread_detach(t);
-	
-	return true;
+	return false;
 }