diff --git a/src/testprograms/hllapi.c b/src/testprograms/hllapi.c
index d5b1917..a321c4a 100644
--- a/src/testprograms/hllapi.c
+++ b/src/testprograms/hllapi.c
@@ -30,6 +30,7 @@
  #include <stdio.h>
  #include <string.h>
  #include <time.h>
+ #include <getopt.h>
  #include <pw3270/hllapi.h>
 
  #if defined(DEBUG) && defined(_WIN32)
@@ -39,10 +40,11 @@
 
  #define MAX_DATA_SIZE 8000	//< Maximum data size for this application.
 
- static CHAR hllapi_data[MAX_DATA_SIZE];
+// static CHAR hllapi_data[MAX_DATA_SIZE];
 
 /*---[ Implement ]--------------------------------------------------------------------------------*/
 
+ /*
  static void connect_ps(const char *session)
  {
  	WORD len;
@@ -54,51 +56,65 @@
 	len = strlen(session);
 	hllapi(&fn,hllapi_data,&len,&rc);
 
-	/*
-	if(rc)
-	{
-		trace("HLLAPI_CMD_CONNECTPS(%s) exits with rc=%d", session, (int) rc);
-	}
-	*/
-
  }
+ */
 
- int main(int numpar, char *param[])
+ int main(int argc, char **argv)
  {
+ 	const char *host	= NULL;
  	const char *session = "pw3270:A";
 
- 	connect_ps(session);
-
- 	/*
+	#pragma GCC diagnostic push
+	static struct option options[] =
+	{
+		{ "host",			required_argument,	0,	'h' },
+		{ "session-name",	required_argument,	0,	'S' },
+		{ 0, 0, 0, 0}
+	};
+	#pragma GCC diagnostic pop
 
- 	printf("init(%s)=%d\n",session,(int) hllapi_init((LPSTR) session));
-	printf("revision=%d\n",(int) hllapi_get_revision());
-	printf("connect=%d\n",(int) hllapi_connect((char *) "fandezhi.efglobe.com:23",1));
-	printf("wait_for_ready=%d\n",(int) hllapi_wait_for_ready(10));
-	printf("connected=%s\n",(int) hllapi_is_connected() ? "Yes" : "No");
+	int long_index =0;
+	int opt;
+	while((opt = getopt_long(argc, argv, "h:S:", options, &long_index )) != -1)
+	{
 
-//	printf("disconnect=%d\n",(int) hllapi_disconnect());
+		switch(opt)
+		{
+		case 'h':
+			host = optarg;
+			break;
 
+		case 'S':
+			session = optarg;
+			break;
 
-	printf("deinit=%d\n",(int) hllapi_deinit());
+		}
 
- 	DWORD	revision;
- 	int 	rc;
+	}
 
- 	rc = hllapi_init("");
+ 	int rc = hllapi_init((char *) session);
  	if(rc)
 	{
-		printf("Init exits with rc=%d\n",rc);
+		printf("hllapi_init returns with rc=%d\n",rc);
 		return rc;
 	}
 
-	if(!hllapi_get_revision(&revision))
-		printf("Library revision is %d\n",(int) revision);
+	printf("Library revision is %d\n",(int) hllapi_get_revision());
+
+	if(host) {
 
+		printf("connect=%d\n",(int) hllapi_connect((char *) host,1));
+		printf("wait_for_ready=%d\n",(int) hllapi_wait_for_ready(10));
+		printf("connected=%s\n",(int) hllapi_is_connected() ? "Yes" : "No");
+
+		printf("disconnect=%d\n",(int) hllapi_disconnect());
+	}
+
+	printf("connected=%s\n",(int) hllapi_is_connected() ? "Yes" : "No");
 
-	printf("Deinit exits with rc=%d\n",rc);
 	rc = hllapi_deinit();
-*/
+	printf("hllapi_deinit exits with rc=%d\n",rc);
+
 	return 0;
  }
 
diff --git a/src/testprograms/ipc3270c.c b/src/testprograms/ipc3270c.c
index b3918c2..e67c6a6 100644
--- a/src/testprograms/ipc3270c.c
+++ b/src/testprograms/ipc3270c.c
@@ -209,33 +209,20 @@
 
 int main (int argc, char **argv) {
 
-	/*
-	GVariantBuilder builder;
+	static const GOptionEntry app_options[] = {
+		{ "plugin-path",		'P', 0, G_OPTION_ARG_STRING, &plugin_path, 	"Path for plugin search",	NULL						},
+		{ "install",			'S', 0, G_OPTION_ARG_STRING, &session_name,	"Session name",				"pw3270"					},
+		{ "module",				'm', 0, G_OPTION_ARG_STRING, &plugin_name,	"Module name",				"ipc3270c."	G_MODULE_SUFFIX	},
 
-	g_variant_builder_init(&builder,G_VARIANT_TYPE("(isi)"));
-
-	g_variant_builder_add(&builder, "i", 10);
-	g_variant_builder_add(&builder, "s", "teste");
-	g_variant_builder_add(&builder, "i", 20);
-
-	GVariant *value = g_variant_builder_end(&builder);
-
-	size_t szPacket = 0;
-	g_autofree unsigned char * buffer = ipc3270_pack("teste", value, &szPacket);
-	g_variant_unref(value);
-
-	debug("Package \"%s\" was created with %u bytes", buffer, (unsigned int) szPacket);
-
-	value = ipc3270_unpack(buffer);
-
-	g_variant_unref(value);
-	*/
+		{ NULL }
+	};
 
 	GtkApplication *app;
 	int status;
 
-	app = gtk_application_new ("br.com.bb.pw3270",G_APPLICATION_FLAGS_NONE);
+	app = gtk_application_new("br.com.bb.ipc3270c",G_APPLICATION_FLAGS_NONE);
 
+	g_application_add_main_option_entries(G_APPLICATION(app),app_options);
 	g_signal_connect (app, "activate", G_CALLBACK(activate), NULL);
 
 	status = g_application_run (G_APPLICATION (app), argc, argv);
--
libgit2 0.21.2