diff --git a/src/test/check_getdns_address_sync.h b/src/test/check_getdns_address_sync.h
index 46e053dc..f4c790ff 100644
--- a/src/test/check_getdns_address_sync.h
+++ b/src/test/check_getdns_address_sync.h
@@ -27,7 +27,7 @@
      {
       /*
        *  name = NULL
-       *  expect: GETDNS_RETURN_GENERIC_ERROR
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   
        struct getdns_dict *response = NULL;
@@ -35,7 +35,7 @@
        CONTEXT_CREATE(TRUE);
 
        ASSERT_RC(getdns_address_sync(context, NULL, NULL, &response), 
-         GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_address_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_address_sync()");
 
        CONTEXT_DESTROY;
      }
@@ -83,14 +83,14 @@
      {
       /*
        *  response = NULL
-       *  expect:  GETDNS_RETURN_GENERIC_ERROR
+       *  expect:  GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   
 
        CONTEXT_CREATE(TRUE);
 
        ASSERT_RC(getdns_address_sync(context, "google.com", NULL, NULL), 
-         GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_address_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_address_sync()");
 
        CONTEXT_DESTROY;
      }
diff --git a/src/test/check_getdns_context_create.h b/src/test/check_getdns_context_create.h
index 5f35d4fb..570e87d0 100644
--- a/src/test/check_getdns_context_create.h
+++ b/src/test/check_getdns_context_create.h
@@ -13,11 +13,11 @@
      {
       /*
        *  context = NULL
-       *  expect: GETDNS_RETURN_GENERIC_ERROR
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
 
        ASSERT_RC(getdns_context_create(NULL, TRUE),
-         GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_context_create()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_context_create()");
      }
      END_TEST
      
diff --git a/src/test/check_getdns_dict_get_bindata.h b/src/test/check_getdns_dict_get_bindata.h
index 637d7c2d..70a9a931 100644
--- a/src/test/check_getdns_dict_get_bindata.h
+++ b/src/test/check_getdns_dict_get_bindata.h
@@ -13,13 +13,13 @@
     {
      /*
       *  this_dict = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_bindata *answer = NULL;
 
       ASSERT_RC(getdns_dict_get_bindata(this_dict, "key", &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_bindata()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_bindata()");
 
     }
     END_TEST
@@ -28,7 +28,7 @@
     {
      /*
       *  name = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_bindata bindata = { 8, (void *)"bindata" };
@@ -39,7 +39,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_bindata()");
 
       ASSERT_RC(getdns_dict_get_bindata(this_dict, NULL, &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_bindata()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_bindata()");
 
       DICT_DESTROY(this_dict);
     }
@@ -96,7 +96,7 @@
     {
      /*
       *  answer = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_bindata bindata = { 8, (void *)"bindata" };
@@ -107,7 +107,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_bindata()");
 
       ASSERT_RC(getdns_dict_get_bindata(this_dict, "bindata", NULL),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_bindata()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_bindata()");
 
       DICT_DESTROY(this_dict);
     }
diff --git a/src/test/check_getdns_dict_get_dict.h b/src/test/check_getdns_dict_get_dict.h
index cdf6046a..99272d5b 100644
--- a/src/test/check_getdns_dict_get_dict.h
+++ b/src/test/check_getdns_dict_get_dict.h
@@ -13,13 +13,13 @@
     {
      /*
       *  this_dict = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_dict *answer = NULL;
 
       ASSERT_RC(getdns_dict_get_dict(this_dict, "key", &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_dict()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_dict()");
 
     }
     END_TEST
@@ -28,7 +28,7 @@
     {
      /*
       *  name = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_dict *second_dict = NULL;
@@ -40,7 +40,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_dict()");
 
       ASSERT_RC(getdns_dict_get_dict(this_dict, NULL, &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_dict()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_dict()");
 
       DICT_DESTROY(this_dict);
       DICT_DESTROY(second_dict);
@@ -111,7 +111,7 @@
     {
      /*
       *  answer = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_dict *second_dict = NULL;
@@ -123,7 +123,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_dict()");
 
       ASSERT_RC(getdns_dict_get_dict(this_dict, "dict", NULL),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_dict()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_dict()");
 
       DICT_DESTROY(this_dict);
       DICT_DESTROY(second_dict);
diff --git a/src/test/check_getdns_dict_get_int.h b/src/test/check_getdns_dict_get_int.h
index ede1f4de..994a210d 100644
--- a/src/test/check_getdns_dict_get_int.h
+++ b/src/test/check_getdns_dict_get_int.h
@@ -13,13 +13,13 @@
     {
      /*
       *  this_dict = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       uint32_t answer;
 
       ASSERT_RC(getdns_dict_get_int(this_dict, "key", &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_int()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_int()");
 
     }
     END_TEST
@@ -28,7 +28,7 @@
     {
      /*
       *  name = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       uint32_t answer;
@@ -38,7 +38,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_int()");
 
       ASSERT_RC(getdns_dict_get_int(this_dict, NULL, &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_int()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_int()");
 
       DICT_DESTROY(this_dict);
     }
@@ -95,7 +95,7 @@
     {
      /*
       *  answer = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
 
@@ -105,7 +105,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_int()");
 
       ASSERT_RC(getdns_dict_get_int(this_dict, "int", NULL),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_int()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_int()");
 
       DICT_DESTROY(this_dict);
     }
diff --git a/src/test/check_getdns_dict_get_list.h b/src/test/check_getdns_dict_get_list.h
index 828866bb..c5c370f0 100644
--- a/src/test/check_getdns_dict_get_list.h
+++ b/src/test/check_getdns_dict_get_list.h
@@ -13,13 +13,13 @@
     {
      /*
       *  this_dict = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_list *answer = NULL;
 
       ASSERT_RC(getdns_dict_get_list(this_dict, "key", &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_list()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_list()");
 
     }
     END_TEST
@@ -28,7 +28,7 @@
     {
      /*
       *  name = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_list *list = NULL;
@@ -40,7 +40,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_list()");
 
       ASSERT_RC(getdns_dict_get_list(this_dict, NULL, &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_list()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_list()");
 
       DICT_DESTROY(this_dict);
       LIST_DESTROY(list);
@@ -103,7 +103,7 @@
     {
      /*
       *  answer = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_list *list = NULL;
@@ -115,7 +115,7 @@
         GETDNS_RETURN_GOOD, "Return code from getdns_dict_set_list()");
 
       ASSERT_RC(getdns_dict_get_list(this_dict, "list", NULL),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_list()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_list()");
 
       DICT_DESTROY(this_dict);
       LIST_DESTROY(list);
diff --git a/src/test/check_getdns_dict_get_names.h b/src/test/check_getdns_dict_get_names.h
index 5ba25a94..6b7c0fcb 100644
--- a/src/test/check_getdns_dict_get_names.h
+++ b/src/test/check_getdns_dict_get_names.h
@@ -13,13 +13,13 @@
     {
      /*
       *  this_dict = NULL
-      *  expect = GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect = GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_list *answer = NULL;
 
       ASSERT_RC(getdns_dict_get_names(this_dict, &answer),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_names()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_names()");
 
     }
     END_TEST
@@ -28,14 +28,14 @@
     {
      /*
       *  answer = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
 
       DICT_CREATE(this_dict);
 
       ASSERT_RC(getdns_dict_get_names(this_dict, NULL),
-        GETDNS_RETURN_NO_SUCH_DICT_NAME, "Return code from getdns_dict_get_names()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_dict_get_names()");
 
       DICT_DESTROY(this_dict);
     }
diff --git a/src/test/check_getdns_dict_set_bindata.h b/src/test/check_getdns_dict_set_bindata.h
index 5f8d145b..94da80b3 100644
--- a/src/test/check_getdns_dict_set_bindata.h
+++ b/src/test/check_getdns_dict_set_bindata.h
@@ -13,7 +13,7 @@
     {
      /*
       *  this_dict = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
       struct getdns_bindata bindata = { 8, (void *)"bindata" };
diff --git a/src/test/check_getdns_dict_set_int.h b/src/test/check_getdns_dict_set_int.h
index 7be7653a..1310e4de 100644
--- a/src/test/check_getdns_dict_set_int.h
+++ b/src/test/check_getdns_dict_set_int.h
@@ -27,7 +27,7 @@
     {
      /*
       *  name = NULL
-      *  expect:  GETDNS_RETURN_NO_SUCH_DICT_NAME
+      *  expect:  GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_dict *this_dict = NULL;
 
diff --git a/src/test/check_getdns_general.h b/src/test/check_getdns_general.h
index 1ffc0e86..4fa2c1d9 100644
--- a/src/test/check_getdns_general.h
+++ b/src/test/check_getdns_general.h
@@ -28,7 +28,7 @@
      {
       /*
        *  name = NULL
-       *  expect: GETDNS_RETURN_GENERIC_ERROR
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   \
        struct event_base *event_base = NULL;    \
@@ -39,7 +39,7 @@
 
        ASSERT_RC(getdns_general(context, NULL, GETDNS_RRTYPE_A, NULL,
          NULL, &transaction_id, callbackfn),
-         GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_general()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_general()");
 
        RUN_EVENT_LOOP;
        CONTEXT_DESTROY;
diff --git a/src/test/check_getdns_general_sync.h b/src/test/check_getdns_general_sync.h
index 21d98988..f56df85e 100644
--- a/src/test/check_getdns_general_sync.h
+++ b/src/test/check_getdns_general_sync.h
@@ -27,7 +27,7 @@
      {
       /*
        *  name = NULL
-       *  expect: GETDNS_RETURN_GENERIC_ERROR
+       *  expect: GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;
        struct getdns_dict *response = NULL;
@@ -35,7 +35,7 @@
        CONTEXT_CREATE(TRUE);
 
        ASSERT_RC(getdns_general_sync(context, NULL, GETDNS_RRTYPE_A, NULL, &response), 
-         GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_general_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_general_sync()");
 
        CONTEXT_DESTROY;
      }
@@ -83,14 +83,14 @@
      {
       /*
        *  response = NULL
-       *  expect:  GETDNS_RETURN_GENERIC_ERROR
+       *  expect:  GETDNS_RETURN_INVALID_PARAMETER
        */
        struct getdns_context *context = NULL;   
 
        CONTEXT_CREATE(TRUE);
 
        ASSERT_RC(getdns_general_sync(context, "google.com", GETDNS_RRTYPE_A, NULL, NULL), 
-         GETDNS_RETURN_GENERIC_ERROR, "Return code from getdns_general_sync()");
+         GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_general_sync()");
 
        CONTEXT_DESTROY;
      }
diff --git a/src/test/check_getdns_list_get_data_type.h b/src/test/check_getdns_list_get_data_type.h
index 874e6e34..eb968533 100644
--- a/src/test/check_getdns_list_get_data_type.h
+++ b/src/test/check_getdns_list_get_data_type.h
@@ -13,14 +13,14 @@
     {
      /*
       *  list = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_LIST_ITEM
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_list *list = NULL;
       size_t index = 0;
       getdns_data_type answer;
 
       ASSERT_RC(getdns_list_get_data_type(list, index, &answer),
-        GETDNS_RETURN_NO_SUCH_LIST_ITEM, "Return code from getdns_list_get_data_type()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_list_get_data_type()");
     }
     END_TEST
 
diff --git a/src/test/check_getdns_list_get_length.h b/src/test/check_getdns_list_get_length.h
index f43b980c..9c71c2c4 100644
--- a/src/test/check_getdns_list_get_length.h
+++ b/src/test/check_getdns_list_get_length.h
@@ -13,13 +13,13 @@
     {
      /*
       *  list = NULL
-      *  expect = GETDNS_RETURN_NO_SUCH_LIST_ITEM
+      *  expect = GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_list *list = NULL;
       size_t length;
 
       ASSERT_RC(getdns_list_get_length(list, &length),
-        GETDNS_RETURN_NO_SUCH_LIST_ITEM, "Return code from getdns_list_get_length()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_list_get_length()");
 
     }
     END_TEST
@@ -28,14 +28,14 @@
     {
      /*
       *  answer = NULL
-      *  expect: GETDNS_RETURN_NO_SUCH_LIST_ITEM
+      *  expect: GETDNS_RETURN_INVALID_PARAMETER
       */
       struct getdns_list *list = NULL;
 
       LIST_CREATE(list);
 
       ASSERT_RC(getdns_list_get_length(list, NULL),
-        GETDNS_RETURN_NO_SUCH_LIST_ITEM, "Return code from getdns_list_get_length()");
+        GETDNS_RETURN_INVALID_PARAMETER, "Return code from getdns_list_get_length()");
 
       LIST_DESTROY(list);
     }