diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..bfc6d9d
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,9 @@
+CFLAGS = -Wall
+SRCS = load_rw.c
+OBJS = $(SRCS:%.c=%.o)
+
+load_rw: ${OBJS}
+	${CC} -o $@ $^
+
+clean:
+	rm *.o load_rw
diff --git a/test/load_rw.c b/test/load_rw.c
index 075f241..82070e6 100644
--- a/test/load_rw.c
+++ b/test/load_rw.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
 
@@ -33,58 +34,80 @@ int
 main(int argc, char **argv)
 {
 	int fd, res, i;
-	char *str, *dir, *tmp;
+	char *str, *drv, *dir;
 
 	if (argc < 2) {
-		printf("USAGE: %.20 <fpgafs-mountpoint>\n", argv[0]);
+		printf("USAGE: %20s <fpgafs-mountpoint>\n", argv[0]);
 		return -1;
 	}
 
 	dir=malloc(sizeof(argv[1]) + 10);
 	str=malloc(sizeof(argv[1]) + 15);
+	drv=malloc(sizeof(argv[1]) + 15);
 	sprintf(dir, "%s/bla", argv[1]);
+	sprintf(drv, "%s/bla/lldrv", argv[1]);
 	sprintf(str, "%s/bla/load", argv[1]);
 
-	if (mkdir(dir, 0777) == -1) {
-		printf("ERROR-1: %s\n", strerror(errno));
+	/* create context */
+	if (mkdir(dir, 0777) < 0) {
+		printf("ERROR-%d\n", __LINE__);
 		return -1;
 	}
 	printf("created: %s\n", dir);
 
-	if ((fd = open(str, O_WRONLY, 0)) == -1) {
-		printf("ERROR-2: %s\n", strerror(errno));
+	/* set low level driver */
+	if ((fd = open(drv, O_WRONLY, 0)) < 0) {
+		printf("ERROR-%d: %d\n", __LINE__, fd);
 		return -1;
 	}
-	printf("opened: %s\n", str);
+	printf("opened: %s\n", drv);
 
-	if ((res=write(fd, src, sizeof(src))) == -1) {
-		printf("ERROR-3: %s\n", strerror(errno));
+	if ((res=write(fd, "dbg", sizeof("dbg"))) < 0) {
+		printf("ERROR-%d: %d\n", __LINE__, res);
+		goto out;
+	}
+	close(fd);
+	printf("set low level driver: %d\n", res);
+
+	/* load image */
+	if ((fd = open(str, O_WRONLY, 0)) < 0) {
+		printf("ERROR-%d: %d\n", __LINE__, fd);
 		return -1;
 	}
+	printf("opened: %s\n", str);fflush(stdout);
+
+	if ((res=write(fd, src, sizeof(src))) < 0) {
+		printf("ERROR-%d: %d\n", __LINE__, res);
+		goto out;
+	}
 	printf("written (%d): ", res);
 	for (i=0; i < sizeof(src); i++)
 		printf("0x%x ", src[i]);
 	printf("\n");
 	close(fd);
 
-	if ((fd = open(str, O_RDONLY, 0)) == -1) {
-		printf("ERROR-4: %s\n", strerror(errno));
+	/* read image */
+	if ((fd = open(str, O_RDONLY, 0)) < 0) {
+		printf("ERROR-%d: %d\n", __LINE__, fd);
 		return -1;
 	}
 	printf("opened: %s\n", str);
 
-	if ((res=read(fd, des, sizeof(des))) == -1) {
-		printf("ERROR-5: %s\n", strerror(errno));
-		return -1;
+	if ((res=read(fd, des, sizeof(des))) < 0) {
+		printf("ERROR-%d: %d\n", __LINE__, res);
+		goto out;
 	}
 	printf("read (%d): ", res);
 	for (i=0; i < sizeof(des); i++)
 		printf("0x%x ", des[i]);
 	printf("\n");
+
+out:
 	close(fd);
 
-	if (rmdir(dir) == -1) {
-		printf("ERROR-6: %s\n", strerror(errno));
+	/* destroy context */
+	if (rmdir(dir) < 0) {
+		printf("ERROR-%d\n", __LINE__);
 		return -1;
 	}
 	printf("removed: %s\n", dir);