  	if (! nopoll_conn_is_ok (conn)) {
  		printf ("ERROR: Expected to find proper client connection status, but found error..\n");
  		return nopoll_false;
-@@ -1062,7 +1062,7 @@ nopoll_bool test_08 (void) {
+@@ -1062,7 +1223,7 @@ nopoll_bool test_08 (void) {
  	ctx = create_ctx ();
  
  	/* call to connect to TLS port expecting non-TLS protocol */

 	if (! nopoll_conn_is_ok (conn)) {
 		printf ("ERROR: Expected to find proper client connection status, but found error..\n");
 		return nopoll_false;
@@ -1020,7 +1020,7 @@ nopoll_bool test_07 (void) {
 	nopoll_conn_opts_ssl_peer_verify (opts, nopoll_false);
 
 	/* call to create a connection */
-	conn = nopoll_conn_tls_new (ctx, opts, "localhost", "1235", NULL, NULL, NULL, NULL);

+	if (retVal != 0){ 
+		nopoll_log (ctx, NOPOLL_LEVEL_CRITICAL, "unable to resolve host name %s, error: %s", host, gai_strerror(retVal));
 		return -1;
-	} /* end if */
-
-	/* create the socket and check if it */
-	session      = socket (AF_INET, SOCK_STREAM, 0);
-	if (session == NOPOLL_INVALID_SOCKET) {
-		nopoll_log (ctx, NOPOLL_LEVEL_CRITICAL, "unable to create socket");
-		return -1;
-	} /* end if */
-
-	/* disable nagle */
