--- libaitcfg/example/test.c	2012/04/03 11:51:52	1.1.2.9
+++ libaitcfg/example/test.c	2012/04/03 14:42:30	1.1.2.13
@@ -59,23 +59,38 @@ int main()
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", ""));
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, NULL, "att"));
 	printf("UnsetAttribute=%d\n", cfg_unsetAttribute(&lst, "global", "attr2"));
-	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999"));
+	printf("SetAttribute=%d\n", cfg_setAttribute(&lst, "bzyt", "111", "99999"));
 
 	cfgWriteConfig(stdout, &tmp, 0);
 	cfgWriteConfig(stdout, &lst, 1);
 	printf("1) ---------------------------------\n");
-#if 0
-	printf("%d\n---------------------------------\n", MergeConfig(&lst, &tmp));
-	WriteConfig(stdout, &lst);
-//	printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp));
-//	WriteConfig(stdout, &lst);
-	printf("%d\n---------------------------------\n", ConcatConfig(&lst, &tmp));
-	WriteConfig(stdout, &lst);
 
-	printf("CreateConfig=%d\n", CreateConfig("test4e.cfg", &lst));
-	printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError());
+#ifndef SKIP_TEST_CONCAT
+	printf("concat=%d\n---------------------------------\n", cfgConcatConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 0);
+	printf("concat=%d\n---------------------------------\n", cfgConcatConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 1);
+#else
+	cfgUnloadConfig(&tmp);
 #endif
-	cfgUnloadConfig(&lst);
+
+	cfgInitConfig(&tmp);
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "piuk", "blahz"));
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "bzyt", "00", "99999"));
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, "global", "gniah", "tiiiiiii"));
+	printf("tmp: SetAttribute=%d\n", cfg_setAttribute(&tmp, NULL, "att", "0001122777777"));
+
+#ifndef SKIP_TEST_MERGE
+	printf("merge=%d\n---------------------------------\n", cfgMergeConfig(&lst, &tmp));
+	cfgWriteConfig(stdout, &lst, 1);
+#else
 	cfgUnloadConfig(&tmp);
+#endif
+
+	printf("CreateConfig=%d\n", cfgCreateConfig("test4e.cfg", &lst, 1));
+	printf("errno=%d error=%s\n", cfg_GetErrno(), cfg_GetError());
+
+	cfgUnloadConfig(&tmp);
+	cfgUnloadConfig(&lst);
 	return 0;
 }