diff --git a/lib/src/restd.c b/lib/src/restd.c
index d203fc2..c7f61c6 100644
--- a/lib/src/restd.c
+++ b/lib/src/restd.c
@@ -182,7 +182,7 @@ static int notify_loopexit(restd_server_t *server);
 static void notify_cb(struct bufferevent *buffer, void *userdata);
 void rest_request_cb(struct evhttp_request *req, void *arg);
 void print_request_info(struct evhttp_request *req);
-void restd_http_response_from_file(struct evhttp_request *req, int code, int fd, const char *content_type);
+void restd_http_response_from_file(struct evhttp_request *req, int code, FILE *f, const char *content_type);
 bool manage_hook(restd_hook_t *hook, restd_resp_t *response, const char *request_path);
 
 /*--------------------------- PUBLIC FUNCTIONS -------------------------------*/
@@ -831,19 +831,20 @@ void rest_request_cb(struct evhttp_request *req, void *arg)
             }
         }
     }
-    
+
     // No Hook Found check if it's a real file into document root.
     root_path = restd_server_get_option(server, "server.root_path");
     if ((root_path != NULL) && (strlen(root_path) != 0))
     {
-        int fd;
+        FILE *f;
         char buf[1024] = "";
         qstrcatf(buf, "%s%s", root_path, request_path);
-        fd = open(buf, 0);
-        if (fd != -1)
+        f = fopen(buf, "rb");
+        if (f != NULL)
         {
-            restd_http_response_from_file(req, 200, fd, file_mime_lookup(buf));
+            restd_http_response_from_file(req, 200, f, file_mime_lookup(buf));
             restd_resp_free(response);
+            fclose(f);
             return;
         }
         else
@@ -920,22 +921,29 @@ void print_request_info(struct evhttp_request *req)
 
 /*--------------------------------------------------------------------------*/
 
-void restd_http_response_from_file(struct evhttp_request *req, int code, int fd, const char *content_type)
+void restd_http_response_from_file(struct evhttp_request *req, int code, FILE *f, const char *content_type)
 {
-    struct evbuffer *resp_buf;
-    struct evkeyvalq *resp_headers;
-    ev_off_t len;
+    struct evbuffer *output_buffer;
+    struct evkeyvalq *output_headers;
+    char buf[1024];
+    size_t s;
+    size_t bytes = 0;
 
-    resp_buf = evhttp_request_get_output_buffer(req);
-    resp_headers = evhttp_request_get_output_headers(req);
+    output_buffer = evhttp_request_get_output_buffer(req);
+    output_headers = evhttp_request_get_output_headers(req);
 
-    len = lseek(fd, 0, SEEK_END);
+    while ((s = fread(buf, 1, sizeof(buf), f)) > 0)
+    {
+        evbuffer_add(output_buffer, buf, s);
+        bytes += s;
+    }
 
-    evbuffer_add_file(resp_buf, fd, 0, len);
+    evutil_snprintf(buf, sizeof(buf) - 1, "%lu", (unsigned long)bytes);
 
-    evhttp_add_header(resp_headers, "Content-Type", content_type);
+    evhttp_add_header(output_headers, "Content-Length", buf);
+    evhttp_add_header(output_headers, "Content-Type", content_type);
 
-    evhttp_send_reply(req, code, NULL, resp_buf);
+    evhttp_send_reply(req, code, NULL, output_buffer);
 }
 
 /*--------------------------------------------------------------------------*/
diff --git a/lib/tests/http-server.c b/lib/tests/http-server.c
new file mode 100644
index 0000000..f285453
--- /dev/null
+++ b/lib/tests/http-server.c
@@ -0,0 +1,581 @@
+    /*
+      A trivial static http webserver using Libevent's evhttp.
+      This is not the best code in the world, and it does some fairly stupid stuff
+      that you would never want to do in a production webserver. Caveat hackor!
+     */
+
+    /* Compatibility for possible missing IPv6 declarations */
+    #include "../util-internal.h"
+
+    #include <stdio.h>
+    #include <stdlib.h>
+    #include <string.h>
+
+    #include <sys/types.h>
+    #include <sys/stat.h>
+
+    #ifdef _WIN32
+    #include <winsock2.h>
+    #include <ws2tcpip.h>
+    #include <windows.h>
+    #include <getopt.h>
+    #include <io.h>
+    #include <fcntl.h>
+    #ifndef S_ISDIR
+    #define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR)
+    #endif
+    #else /* !_WIN32 */
+    #include <sys/stat.h>
+    #include <sys/socket.h>
+    #include <fcntl.h>
+    #include <unistd.h>
+    #include <dirent.h>
+    #endif /* _WIN32 */
+    #include <signal.h>
+
+    #ifdef EVENT__HAVE_SYS_UN_H
+    #include <sys/un.h>
+    #endif
+    #ifdef EVENT__HAVE_AFUNIX_H
+    #include <afunix.h>
+    #endif
+
+    #include <event2/event.h>
+    #include <event2/http.h>
+    #include <event2/listener.h>
+    #include <event2/buffer.h>
+    #include <event2/util.h>
+    #include <event2/keyvalq_struct.h>
+
+    #ifdef _WIN32
+    #include <event2/thread.h>
+    #endif /* _WIN32 */
+
+    #ifdef EVENT__HAVE_NETINET_IN_H
+    #include <netinet/in.h>
+    # ifdef _XOPEN_SOURCE_EXTENDED
+    #  include <arpa/inet.h>
+    # endif
+    #endif
+
+    #ifdef _WIN32
+    #ifndef stat
+    #define stat _stat
+    #endif
+    #ifndef fstat
+    #define fstat _fstat
+    #endif
+    #ifndef open
+    #define open _open
+    #endif
+    #ifndef close
+    #define close _close
+    #endif
+    #ifndef O_RDONLY
+    #define O_RDONLY _O_RDONLY
+    #endif
+    #endif /* _WIN32 */
+
+    char uri_root[512];
+
+    static const struct table_entry {
+    	const char *extension;
+    	const char *content_type;
+    } content_type_table[] = {
+    	{ "txt", "text/plain" },
+    	{ "c", "text/plain" },
+    	{ "h", "text/plain" },
+    	{ "html", "text/html" },
+    	{ "htm", "text/htm" },
+    	{ "css", "text/css" },
+    	{ "gif", "image/gif" },
+    	{ "jpg", "image/jpeg" },
+    	{ "jpeg", "image/jpeg" },
+    	{ "png", "image/png" },
+    	{ "pdf", "application/pdf" },
+    	{ "ps", "application/postscript" },
+    	{ NULL, NULL },
+    };
+
+    struct options {
+    	int port;
+    	int iocp;
+    	int verbose;
+
+    	int unlink;
+    	const char *unixsock;
+    	const char *docroot;
+    };
+
+    /* Try to guess a good content-type for 'path' */
+    static const char *
+    guess_content_type(const char *path)
+    {
+    	const char *last_period, *extension;
+    	const struct table_entry *ent;
+    	last_period = strrchr(path, '.');
+    	if (!last_period || strchr(last_period, '/'))
+    		goto not_found; /* no exension */
+    	extension = last_period + 1;
+    	for (ent = &content_type_table[0]; ent->extension; ++ent) {
+    		if (!evutil_ascii_strcasecmp(ent->extension, extension))
+    			return ent->content_type;
+    	}
+
+    not_found:
+    	return "application/misc";
+    }
+
+    /* Callback used for the /dump URI, and for every non-GET request:
+     * dumps all information to stdout and gives back a trivial 200 ok */
+    static void
+    dump_request_cb(struct evhttp_request *req, void *arg)
+    {
+    	const char *cmdtype;
+    	struct evkeyvalq *headers;
+    	struct evkeyval *header;
+    	struct evbuffer *buf;
+
+    	switch (evhttp_request_get_command(req)) {
+    	case EVHTTP_REQ_GET: cmdtype = "GET"; break;
+    	case EVHTTP_REQ_POST: cmdtype = "POST"; break;
+    	case EVHTTP_REQ_HEAD: cmdtype = "HEAD"; break;
+    	case EVHTTP_REQ_PUT: cmdtype = "PUT"; break;
+    	case EVHTTP_REQ_DELETE: cmdtype = "DELETE"; break;
+    	case EVHTTP_REQ_OPTIONS: cmdtype = "OPTIONS"; break;
+    	case EVHTTP_REQ_TRACE: cmdtype = "TRACE"; break;
+    	case EVHTTP_REQ_CONNECT: cmdtype = "CONNECT"; break;
+    	case EVHTTP_REQ_PATCH: cmdtype = "PATCH"; break;
+    	default: cmdtype = "unknown"; break;
+    	}
+
+    	printf("Received a %s request for %s\nHeaders:\n",
+    	    cmdtype, evhttp_request_get_uri(req));
+
+    	headers = evhttp_request_get_input_headers(req);
+    	for (header = headers->tqh_first; header;
+    	    header = header->next.tqe_next) {
+    		printf("  %s: %s\n", header->key, header->value);
+    	}
+
+    	buf = evhttp_request_get_input_buffer(req);
+    	puts("Input data: <<<");
+    	while (evbuffer_get_length(buf)) {
+    		int n;
+    		char cbuf[128];
+    		n = evbuffer_remove(buf, cbuf, sizeof(cbuf));
+    		if (n > 0)
+    			(void) fwrite(cbuf, 1, n, stdout);
+    	}
+    	puts(">>>");
+
+    	evhttp_send_reply(req, 200, "OK", NULL);
+    }
+
+    /* This callback gets invoked when we get any http request that doesn't match
+     * any other callback.  Like any evhttp server callback, it has a simple job:
+     * it must eventually call evhttp_send_error() or evhttp_send_reply().
+     */
+    static void
+    send_document_cb(struct evhttp_request *req, void *arg)
+    {
+    	struct evbuffer *evb = NULL;
+    	struct options *o = arg;
+    	const char *uri = evhttp_request_get_uri(req);
+    	struct evhttp_uri *decoded = NULL;
+    	const char *path;
+    	char *decoded_path;
+    	char *whole_path = NULL;
+    	size_t len;
+    	int fd = -1;
+    	struct stat st;
+
+    	if (evhttp_request_get_command(req) != EVHTTP_REQ_GET) {
+    		dump_request_cb(req, arg);
+    		return;
+    	}
+
+    	printf("Got a GET request for <%s>\n",  uri);
+
+    	/* Decode the URI */
+    	decoded = evhttp_uri_parse(uri);
+    	if (!decoded) {
+    		printf("It's not a good URI. Sending BADREQUEST\n");
+    		evhttp_send_error(req, HTTP_BADREQUEST, 0);
+    		return;
+    	}
+
+    	/* Let's see what path the user asked for. */
+    	path = evhttp_uri_get_path(decoded);
+    	if (!path) path = "/";
+
+    	/* We need to decode it, to see what path the user really wanted. */
+    	decoded_path = evhttp_uridecode(path, 0, NULL);
+    	if (decoded_path == NULL)
+    		goto err;
+    	/* Don't allow any ".."s in the path, to avoid exposing stuff outside
+    	 * of the docroot.  This test is both overzealous and underzealous:
+    	 * it forbids aceptable paths like "/this/one..here", but it doesn't
+    	 * do anything to prevent symlink following." */
+    	if (strstr(decoded_path, ".."))
+    		goto err;
+
+    	len = strlen(decoded_path)+strlen(o->docroot)+2;
+    	if (!(whole_path = malloc(len))) {
+    		perror("malloc");
+    		goto err;
+    	}
+    	evutil_snprintf(whole_path, len, "%s/%s", o->docroot, decoded_path);
+
+    	if (stat(whole_path, &st)<0) {
+    		goto err;
+    	}
+
+    	/* This holds the content we're sending. */
+    	evb = evbuffer_new();
+
+    	if (S_ISDIR(st.st_mode)) {
+    		/* If it's a directory, read the comments and make a little
+    		 * index page */
+    #ifdef _WIN32
+    		HANDLE d;
+    		WIN32_FIND_DATAA ent;
+    		char *pattern;
+    		size_t dirlen;
+    #else
+    		DIR *d;
+    		struct dirent *ent;
+    #endif
+    		const char *trailing_slash = "";
+
+    		if (!strlen(path) || path[strlen(path)-1] != '/')
+    			trailing_slash = "/";
+
+    #ifdef _WIN32
+    		dirlen = strlen(whole_path);
+    		pattern = malloc(dirlen+3);
+    		memcpy(pattern, whole_path, dirlen);
+    		pattern[dirlen] = '\\';
+    		pattern[dirlen+1] = '*';
+    		pattern[dirlen+2] = '\0';
+    		d = FindFirstFileA(pattern, &ent);
+    		free(pattern);
+    		if (d == INVALID_HANDLE_VALUE)
+    			goto err;
+    #else
+    		if (!(d = opendir(whole_path)))
+    			goto err;
+    #endif
+
+    		evbuffer_add_printf(evb,
+                        "<!DOCTYPE html>\n"
+                        "<html>\n <head>\n"
+                        "  <meta charset='utf-8'>\n"
+    		    "  <title>%s</title>\n"
+    		    "  <base href='%s%s'>\n"
+    		    " </head>\n"
+    		    " <body>\n"
+    		    "  <h1>%s</h1>\n"
+    		    "  <ul>\n",
+    		    decoded_path, /* XXX html-escape this. */
+    		    path, /* XXX html-escape this? */
+    		    trailing_slash,
+    		    decoded_path /* XXX html-escape this */);
+    #ifdef _WIN32
+    		do {
+    			const char *name = ent.cFileName;
+    #else
+    		while ((ent = readdir(d))) {
+    			const char *name = ent->d_name;
+    #endif
+    			evbuffer_add_printf(evb,
+    			    "    <li><a href=\"%s\">%s</a>\n",
+    			    name, name);/* XXX escape this */
+    #ifdef _WIN32
+    		} while (FindNextFileA(d, &ent));
+    #else
+    		}
+    #endif
+    		evbuffer_add_printf(evb, "</ul></body></html>\n");
+    #ifdef _WIN32
+    		FindClose(d);
+    #else
+    		closedir(d);
+    #endif
+    		evhttp_add_header(evhttp_request_get_output_headers(req),
+    		    "Content-Type", "text/html");
+    	} else {
+    		/* Otherwise it's a file; add it to the buffer to get
+    		 * sent via sendfile */
+    		const char *type = guess_content_type(decoded_path);
+    		if ((fd = open(whole_path, O_RDONLY)) < 0) {
+    			perror("open");
+    			goto err;
+    		}
+
+    		if (fstat(fd, &st)<0) {
+    			/* Make sure the length still matches, now that we
+    			 * opened the file :/ */
+    			perror("fstat");
+    			goto err;
+    		}
+    		evhttp_add_header(evhttp_request_get_output_headers(req),
+    		    "Content-Type", type);
+    		evbuffer_add_file(evb, fd, 0, st.st_size);
+    	}
+
+    	evhttp_send_reply(req, 200, "OK", evb);
+    	goto done;
+    err:
+    	evhttp_send_error(req, HTTP_NOTFOUND, NULL);
+    	if (fd>=0)
+    		close(fd);
+    done:
+    	if (decoded)
+    		evhttp_uri_free(decoded);
+    	if (decoded_path)
+    		free(decoded_path);
+    	if (whole_path)
+    		free(whole_path);
+    	if (evb)
+    		evbuffer_free(evb);
+    }
+
+    static void
+    print_usage(FILE *out, const char *prog, int exit_code)
+    {
+    	fprintf(out,
+    		"Syntax: %s [ OPTS ] <docroot>\n"
+    		" -p      - port\n"
+    		" -U      - bind to unix socket\n"
+    		" -u      - unlink unix socket before bind\n"
+    		" -I      - IOCP\n"
+    		" -v      - verbosity, enables libevent debug logging too\n", prog);
+    	exit(exit_code);
+    }
+    static struct options
+    parse_opts(int argc, char **argv)
+    {
+    	struct options o;
+    	int opt;
+
+    	memset(&o, 0, sizeof(o));
+
+    	while ((opt = getopt(argc, argv, "hp:U:uIv")) != -1) {
+    		switch (opt) {
+    			case 'p': o.port = atoi(optarg); break;
+    			case 'U': o.unixsock = optarg; break;
+    			case 'u': o.unlink = 1; break;
+    			case 'I': o.iocp = 1; break;
+    			case 'v': ++o.verbose; break;
+    			case 'h': print_usage(stdout, argv[0], 0); break;
+    			default : fprintf(stderr, "Unknown option %c\n", opt); break;
+    		}
+    	}
+
+    	if (optind >= argc || (argc - optind) > 1) {
+    		print_usage(stdout, argv[0], 1);
+    	}
+    	o.docroot = argv[optind];
+
+    	return o;
+    }
+
+    static void
+    do_term(int sig, short events, void *arg)
+    {
+    	struct event_base *base = arg;
+    	event_base_loopbreak(base);
+    	fprintf(stderr, "Got %i, Terminating\n", sig);
+    }
+
+    static int
+    display_listen_sock(struct evhttp_bound_socket *handle)
+    {
+    	struct sockaddr_storage ss;
+    	evutil_socket_t fd;
+    	ev_socklen_t socklen = sizeof(ss);
+    	char addrbuf[128];
+    	void *inaddr;
+    	const char *addr;
+    	int got_port = -1;
+
+    	fd = evhttp_bound_socket_get_fd(handle);
+    	memset(&ss, 0, sizeof(ss));
+    	if (getsockname(fd, (struct sockaddr *)&ss, &socklen)) {
+    		perror("getsockname() failed");
+    		return 1;
+    	}
+
+    	if (ss.ss_family == AF_INET) {
+    		got_port = ntohs(((struct sockaddr_in*)&ss)->sin_port);
+    		inaddr = &((struct sockaddr_in*)&ss)->sin_addr;
+    	} else if (ss.ss_family == AF_INET6) {
+    		got_port = ntohs(((struct sockaddr_in6*)&ss)->sin6_port);
+    		inaddr = &((struct sockaddr_in6*)&ss)->sin6_addr;
+    	}
+    #ifdef EVENT__HAVE_STRUCT_SOCKADDR_UN
+    	else if (ss.ss_family == AF_UNIX) {
+    		printf("Listening on <%s>\n", ((struct sockaddr_un*)&ss)->sun_path);
+    		return 0;
+    	}
+    #endif
+    	else {
+    		fprintf(stderr, "Weird address family %d\n",
+    		    ss.ss_family);
+    		return 1;
+    	}
+
+    	addr = evutil_inet_ntop(ss.ss_family, inaddr, addrbuf,
+    	    sizeof(addrbuf));
+    	if (addr) {
+    		printf("Listening on %s:%d\n", addr, got_port);
+    		evutil_snprintf(uri_root, sizeof(uri_root),
+    		    "http://%s:%d",addr,got_port);
+    	} else {
+    		fprintf(stderr, "evutil_inet_ntop failed\n");
+    		return 1;
+    	}
+
+    	return 0;
+    }
+
+    int
+    main(int argc, char **argv)
+    {
+    	struct event_config *cfg = NULL;
+    	struct event_base *base = NULL;
+    	struct evhttp *http = NULL;
+    	struct evhttp_bound_socket *handle = NULL;
+    	struct evconnlistener *lev = NULL;
+    	struct event *term = NULL;
+    	struct options o = parse_opts(argc, argv);
+    	int ret = 0;
+
+    #ifdef _WIN32
+    	{
+    		WORD wVersionRequested;
+    		WSADATA wsaData;
+    		wVersionRequested = MAKEWORD(2, 2);
+    		WSAStartup(wVersionRequested, &wsaData);
+    	}
+    #else
+    	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+    		ret = 1;
+    		goto err;
+    	}
+    #endif
+
+    	setbuf(stdout, NULL);
+    	setbuf(stderr, NULL);
+
+    	/** Read env like in regress */
+    	if (o.verbose || getenv("EVENT_DEBUG_LOGGING_ALL"))
+    		event_enable_debug_logging(EVENT_DBG_ALL);
+
+    	cfg = event_config_new();
+    #ifdef _WIN32
+    	if (o.iocp) {
+    #ifdef EVTHREAD_USE_WINDOWS_THREADS_IMPLEMENTED
+    		evthread_use_windows_threads();
+    		event_config_set_num_cpus_hint(cfg, 8);
+    #endif
+    		event_config_set_flag(cfg, EVENT_BASE_FLAG_STARTUP_IOCP);
+    	}
+    #endif
+
+    	base = event_base_new_with_config(cfg);
+    	if (!base) {
+    		fprintf(stderr, "Couldn't create an event_base: exiting\n");
+    		ret = 1;
+    	}
+    	event_config_free(cfg);
+    	cfg = NULL;
+
+    	/* Create a new evhttp object to handle requests. */
+    	http = evhttp_new(base);
+    	if (!http) {
+    		fprintf(stderr, "couldn't create evhttp. Exiting.\n");
+    		ret = 1;
+    	}
+
+    	/* The /dump URI will dump all requests to stdout and say 200 ok. */
+    	evhttp_set_cb(http, "/dump", dump_request_cb, NULL);
+
+    	/* We want to accept arbitrary requests, so we need to set a "generic"
+    	 * cb.  We can also add callbacks for specific paths. */
+    	evhttp_set_gencb(http, send_document_cb, &o);
+
+    	if (o.unixsock) {
+    #ifdef EVENT__HAVE_STRUCT_SOCKADDR_UN
+    		struct sockaddr_un addr;
+
+    		if (o.unlink && (unlink(o.unixsock) && errno != ENOENT)) {
+    			perror(o.unixsock);
+    			ret = 1;
+    			goto err;
+    		}
+
+    		addr.sun_family = AF_UNIX;
+    		strcpy(addr.sun_path, o.unixsock);
+
+    		lev = evconnlistener_new_bind(base, NULL, NULL,
+    			LEV_OPT_CLOSE_ON_FREE, -1,
+    			(struct sockaddr *)&addr, sizeof(addr));
+    		if (!lev) {
+    			perror("Cannot create listener");
+    			ret = 1;
+    			goto err;
+    		}
+
+    		handle = evhttp_bind_listener(http, lev);
+    		if (!handle) {
+    			fprintf(stderr, "couldn't bind to %s. Exiting.\n", o.unixsock);
+    			ret = 1;
+    			goto err;
+    		}
+    #else /* !EVENT__HAVE_STRUCT_SOCKADDR_UN */
+    		fprintf(stderr, "-U is not supported on this platform. Exiting.\n");
+    		ret = 1;
+    		goto err;
+    #endif /* EVENT__HAVE_STRUCT_SOCKADDR_UN */
+    	}
+    	else {
+    		handle = evhttp_bind_socket_with_handle(http, "0.0.0.0", o.port);
+    		if (!handle) {
+    			fprintf(stderr, "couldn't bind to port %d. Exiting.\n", o.port);
+    			ret = 1;
+    			goto err;
+    		}
+    	}
+
+    	if (display_listen_sock(handle)) {
+    		ret = 1;
+    		goto err;
+    	}
+
+    	term = evsignal_new(base, SIGINT, do_term, base);
+    	if (!term)
+    		goto err;
+    	if (event_add(term, NULL))
+    		goto err;
+
+    	event_base_dispatch(base);
+
+    #ifdef _WIN32
+    	WSACleanup();
+    #endif
+
+    err:
+    	if (cfg)
+    		event_config_free(cfg);
+    	if (http)
+    		evhttp_free(http);
+    	if (term)
+    		event_free(term);
+    	if (base)
+    		event_base_free(base);
+
+    	return ret;
+    }
+    
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a1dc04f..52d2760 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -79,4 +79,9 @@ target_link_libraries (test_device
 	curl
 )
 
+add_custom_command(TARGET test_device POST_BUILD
+    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/tests/index.html ${CMAKE_BINARY_DIR}/bin
+	COMMENT "Install test Files"
+)
+
 endif(DOMO_BUILD_TEST)
diff --git a/src/tests/index.html b/src/tests/index.html
new file mode 100644
index 0000000..8f9a32a
--- /dev/null
+++ b/src/tests/index.html
@@ -0,0 +1 @@
+<html><body><h1>TEST</h1></html>
\ No newline at end of file
diff --git a/src/tests/test_main.c b/src/tests/test_main.c
index b7f3f3b..10dce2f 100644
--- a/src/tests/test_main.c
+++ b/src/tests/test_main.c
@@ -29,6 +29,7 @@
 /*------------------------------- INCLUDES ----------------------------------*/
 
 #include <fcntl.h>
+#include <libgen.h>
 #include <unistd.h>
 
 #include <qlibc/qlibc.h>
diff --git a/src/tests/test_rest.c b/src/tests/test_rest.c
index 5c38086..8dec65e 100644
--- a/src/tests/test_rest.c
+++ b/src/tests/test_rest.c
@@ -49,6 +49,8 @@
 #define kput_method "PUT"
 #define kdelete_method "DELETE"
 
+#define k_max_path_len 200 /* make this larger if you need to. */
+
 /*--------------------------------------------------------------------------*/
 
 int my_error_handler(restd_resp_t *response, int reason, void *arg)
@@ -348,6 +350,39 @@ bool found_special_route(restd_server_t *server, enum evhttp_cmd_type method, co
 
 /*--------------------------------------------------------------------------*/
 
+char *get_config_path(void)
+{
+    int length;
+    char full_path[k_max_path_len];
+    char *working_path;
+    char *last_slash;
+
+    length = readlink("/proc/self/exe", full_path, sizeof(full_path));
+
+    /* Catch some errors: */
+    if (length < 0)
+    {
+        fprintf(stderr, "Error resolving symlink /proc/self/exe.\n");
+        return NULL;
+    }
+    if (length >= k_max_path_len)
+    {
+        fprintf(stderr, "Path too long. Truncated.\n");
+        return NULL;
+    }
+
+    /* I don't know why, but the string this readlink() function 
+      * returns is appended with a '@'.
+      */
+    full_path[length] = '\0'; /* Strip '@' off the end. */
+
+    working_path = dirname(full_path);
+
+    return working_path;
+}
+
+/*--------------------------------------------------------------------------*/
+
 TEST("Rest      - create free\t")
 {
     restd_server_t *rest_server;
@@ -569,3 +604,36 @@ TEST("Rest      - create start access to wrong path\t")
 
     restd_server_free(rest_server);
 }
+
+/*--------------------------------------------------------------------------*/
+
+TEST("Rest      - Test Web server part.\t")
+{
+    int ret;
+    restd_server_t *rest_server;
+    char *root_path;
+    rest_server = restd_server_new();
+    ASSERT_NOT_NULL(rest_server);
+
+    root_path = get_config_path();
+
+    restd_server_set_option(rest_server, "server.port", kserver_port);
+    restd_server_set_option(rest_server, "server.thread", "1");
+    restd_server_set_option(rest_server, "server.root_path", root_path);
+
+    restd_server_register_hook_on_path(rest_server, EVHTTP_REQ_GET, kapi_test_get, my_success_rest_get_handler, NULL);
+    restd_server_register_error_handler(rest_server, my_error_handler, NULL);
+
+    ret = restd_server_start(rest_server);
+    ASSERT_EQUAL_INT(ret, 0);
+
+    sleep(1);
+
+    for (int i = 0; i < 10; i++)
+    {
+        ret = exec_request(kput_method, "http://localhost:" kserver_port "/index.html", 200, "", "<html><body><h1>TEST</h1></html>", false);
+        ASSERT_EQUAL_INT(ret, 0);
+    }
+
+    restd_server_free(rest_server);
+}
\ No newline at end of file