Index: uspace/app/tester/console/console1.c
===================================================================
--- uspace/app/tester/console/console1.c	(revision 73878c12f4265551df8ba416d7e84689744dfbc7)
+++ uspace/app/tester/console/console1.c	(revision cbff4c2fc4078fa172648e8aee30c99bd3fd5eb1)
@@ -29,9 +29,9 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <io/stream.h>
+#include <io/console.h>
+#include <io/color.h>
+#include <io/style.h>
 #include <async.h>
 #include "../tester.h"
-
-#include <console.h>
 
 const char *color_name[] = {
@@ -51,9 +51,9 @@
 
 	printf("Style test: ");
-	console_set_style(STYLE_NORMAL);
+	console_set_style(fphone(stdout), STYLE_NORMAL);
 	printf("normal ");
-	console_set_style(STYLE_EMPHASIS);
+	console_set_style(fphone(stdout), STYLE_EMPHASIS);
 	printf("emphasized");
-	console_set_style(STYLE_NORMAL);
+	console_set_style(fphone(stdout), STYLE_NORMAL);
 	printf(".\n");
 
@@ -61,9 +61,9 @@
 	for (j = 0; j < 2; j++) {
 		for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
-			console_set_color(i, COLOR_WHITE,
+			console_set_color(fphone(stdout), i, COLOR_WHITE,
 			    j ? CATTR_BRIGHT : 0);
 			printf(" %s ", color_name[i]);
 		}
-		console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+		console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
 		putchar('\n');
 	}
@@ -72,9 +72,9 @@
 	for (j = 0; j < 2; j++) {
 		for (i = COLOR_BLACK; i <= COLOR_WHITE; i++) {
-			console_set_color(COLOR_WHITE, i,
+			console_set_color(fphone(stdout), COLOR_WHITE, i,
 			    j ? CATTR_BRIGHT : 0);
 			printf(" %s ", color_name[i]);
 		}
-		console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+		console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
 		putchar('\n');
 	}
@@ -83,22 +83,22 @@
 
 	for (i = 0; i < 255; i += 16) {
-		console_set_rgb_color(0xffffff, i << 16);
+		console_set_rgb_color(fphone(stdout), 0xffffff, i << 16);
 		putchar('X');
 	}
-	console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+	console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
 	putchar('\n');
 
 	for (i = 0; i < 255; i += 16) {
-		console_set_rgb_color(0xffffff, i << 8);
+		console_set_rgb_color(fphone(stdout), 0xffffff, i << 8);
 		putchar('X');
 	}
-	console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+	console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
 	putchar('\n');
 
 	for (i = 0; i < 255; i += 16) {
-		console_set_rgb_color(0xffffff, i);
+		console_set_rgb_color(fphone(stdout), 0xffffff, i);
 		putchar('X');
 	}
-	console_set_color(COLOR_BLACK, COLOR_WHITE, 0);
+	console_set_color(fphone(stdout), COLOR_BLACK, COLOR_WHITE, 0);
 	putchar('\n');
 
Index: uspace/app/tester/ipc/ping_pong.c
===================================================================
--- uspace/app/tester/ipc/ping_pong.c	(revision 73878c12f4265551df8ba416d7e84689744dfbc7)
+++ uspace/app/tester/ipc/ping_pong.c	(revision cbff4c2fc4078fa172648e8aee30c99bd3fd5eb1)
@@ -29,40 +29,45 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <console.h>
 #include <sys/time.h>
+#include <ipc/ns.h>
+#include <async.h>
+#include <errno.h>
 #include "../tester.h"
 
-#define DURATION_SECS		 10
-#define COUNT_GRANULARITY	100
+#define DURATION_SECS      10
+#define COUNT_GRANULARITY  100
 
-char * test_ping_pong(bool quiet)
+char *test_ping_pong(bool quiet)
 {
-	int i;
-	int w, h;
-	struct timeval start, now;
-	long count;
-
-	printf("Pinging console server for %d seconds...\n", DURATION_SECS);
-
+	printf("Pinging ns server for %d seconds...\n", DURATION_SECS);
+	
+	struct timeval start;
 	if (gettimeofday(&start, NULL) != 0)
 		return "Failed getting the time.";
-
-	count = 0;
-
+	
+	uint64_t count = 0;
+	
 	while (true) {
+		struct timeval now;
 		if (gettimeofday(&now, NULL) != 0)
 			return "Failed getting the time.";
-
+		
 		if (tv_sub(&now, &start) >= DURATION_SECS * 1000000L)
 			break;
-
-		for (i = 0; i < COUNT_GRANULARITY; i++)
-			console_get_size(&w, &h);
+		
+		size_t i;
+		for (i = 0; i < COUNT_GRANULARITY; i++) {
+			int retval = async_req_0_0(PHONE_NS, NS_PING);
+			
+			if (retval != EOK)
+				return "Failed to send ping message.";
+		}
+		
 		count += COUNT_GRANULARITY;
 	}
-
-	printf("Completed %ld round trips in %d seconds, %ld RT/s.\n", count,
-	    DURATION_SECS, count / DURATION_SECS);
-
+	
+	printf("Completed %lu round trips in %u seconds, %lu RT/s.\n",
+	    count, DURATION_SECS, count / DURATION_SECS);
+	
 	return NULL;
 }
Index: uspace/app/tester/tester.c
===================================================================
--- uspace/app/tester/tester.c	(revision 73878c12f4265551df8ba416d7e84689744dfbc7)
+++ uspace/app/tester/tester.c	(revision cbff4c2fc4078fa172648e8aee30c99bd3fd5eb1)
@@ -131,4 +131,5 @@
 		list_tests();
 		printf("> ");
+		fflush(stdout);
 		
 		c = getchar();
